Rebake everything using bakefile 0.2.7.

Also updated aclocal inputs and regenerated configure.

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

diff --git a/Makefile.in b/Makefile.in
index 48d0fa717ed21eeb92efcac6f088e32bd68a9b4d..9c96f239985fd40dc068ac74ed282a6fea0e3a99 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -622,6 +622,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2195,6 +2196,7 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2216,6 +2218,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2237,6 +2240,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2258,6 +2262,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2286,6 +2291,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2305,6 +2311,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2317,6 +2324,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2351,6 +2359,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
        wx/unix/apptrait.h \
        wx/unix/chkconf.h \
        wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h \
        wx/unix/stackwalk.h \
@@ -2466,6 +2475,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/gtk/dcscreen.h \
        wx/gtk/dnd.h \
        wx/gtk/evtloop.h \
+       wx/gtk/evtloopsrc.h \
        wx/gtk/font.h \
        wx/gtk/minifram.h \
        wx/gtk/pen.h \
@@ -2974,6 +2984,7 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
        wx/osx/dirdlg.h \
        wx/osx/dnd.h \
        wx/osx/evtloop.h \
+       wx/osx/evtloopsrc.h \
        wx/osx/filedlg.h \
        wx/osx/font.h \
        wx/osx/fontdlg.h \
@@ -3077,6 +3088,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
        wx/osx/dirdlg.h \
        wx/osx/dnd.h \
        wx/osx/evtloop.h \
+       wx/osx/evtloopsrc.h \
        wx/osx/filedlg.h \
        wx/osx/font.h \
        wx/osx/fontdlg.h \
@@ -3710,6 +3722,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/docview.h \
        wx/effects.h \
        wx/evtloop.h \
+       wx/evtloopsrc.h \
        wx/fdrepdlg.h \
        wx/filectrl.h \
        wx/filepicker.h \
@@ -13030,7 +13043,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
-       (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+       (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
        $(DYLIB_RPATH_INSTALL)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
        for f in setup.h $(RCDEFS_H); do \
@@ -13064,7 +13077,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal
 
 uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
        (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
-       (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl)
+       (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py)
        for f in setup.h $(RCDEFS_H); do \
        rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
        done

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 4994b76b33ceddbad6e6145f5fce9b9347486963..fb0e71a163d48975307335aa3bb650f6023dcda4 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,10 +1,10 @@
 dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
-dnl Bakefile 0.2.6 (http://www.bakefile.org)
+dnl Bakefile 0.2.7 (http://www.bakefile.org)
 dnl Do not modify, all changes will be overwritten!
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.7"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS

diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
index 019724a03f2042cdf5299bf56f3321bf0e063f08..4cc4a679ee3243a6b88ff964bf05845eca83045d 100644 (file)
--- a/build/aclocal/bakefile-lang.m4
+++ b/build/aclocal/bakefile-lang.m4
@@ -21,7 +21,7 @@ dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 dnl  DEALINGS IN THE SOFTWARE.
 dnl
-dnl  $Id$
+dnl  $Id: bakefile-lang.m4 1278 2008-11-17 22:26:10Z vadz $
 dnl
 dnl  Compiler detection macros by David Elliott and Vadim Zeitlin
 dnl

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index 8f3d11fbdfd26c1195624dbb180da4ff00b754be..a9b644ac4a95059f90c0864390010b320c00d24d 100644 (file)
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -21,7 +21,7 @@ dnl  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 dnl  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 dnl  DEALINGS IN THE SOFTWARE.
 dnl
-dnl  $Id$
+dnl  $Id: bakefile.m4 1322 2009-10-21 07:37:18Z vaclavslavik $
 dnl
 dnl  Support macros for makefiles generated by BAKEFILE.
 dnl
@@ -337,7 +337,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
 
         dnl Most apps benefit from being fully binded (its faster and static
         dnl variables initialized at startup work).
@@ -838,7 +838,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_SUBST(OBJCXXFLAGS)
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.7"
 
     dnl includes autoconf_inc.m4:
     $1

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index cc29b1b9b167645d243b5e832fc750895568bd33..923f0ac527c38862fa957cacd6af697a04ac5fd5 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -1,212 +1,212 @@
-# =========================================================================\r
-#     This configuration file was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Beware that all changes made to this file will be overwritten next\r
-#     time you run Bakefile!\r
-# =========================================================================\r
-\r
-\r
-# -------------------------------------------------------------------------\r
-# These are configurable options:\r
-# -------------------------------------------------------------------------\r
-\r
-# C compiler \r
-!ifndef CC\r
-CC = bcc32\r
-!endif\r
-\r
-# C++ compiler \r
-!ifndef CXX\r
-CXX = bcc32\r
-!endif\r
-\r
-# Standard flags for CC \r
-!ifndef CFLAGS\r
-CFLAGS = \r
-!endif\r
-\r
-# Standard flags for C++ \r
-!ifndef CXXFLAGS\r
-CXXFLAGS = \r
-!endif\r
-\r
-# Standard preprocessor flags (common for CC and CXX) \r
-!ifndef CPPFLAGS\r
-CPPFLAGS = -a8 -g0\r
-!endif\r
-\r
-# Standard linker flags \r
-!ifndef LDFLAGS\r
-LDFLAGS = \r
-!endif\r
-\r
-# The C preprocessor \r
-!ifndef CPP\r
-CPP = cpp32 -Sr -oCON\r
-!endif\r
-\r
-# What type of library to build? [0,1]\r
-!ifndef SHARED\r
-SHARED = 0\r
-!endif\r
-\r
-# Build wxUniversal instead of native port? [0,1]\r
-!ifndef WXUNIV\r
-WXUNIV = 0\r
-!endif\r
-\r
-# Compile Unicode build of wxWidgets? [0,1]\r
-!ifndef UNICODE\r
-UNICODE = 1\r
-!endif\r
-\r
-# Use MSLU library when building Unicode version. [0,1]\r
-!ifndef MSLU\r
-MSLU = 0\r
-!endif\r
-\r
-# Type of compiled binaries [debug,release]\r
-!ifndef BUILD\r
-BUILD = debug\r
-!endif\r
-\r
-# Should debugging info be included in the executables? The default value\r
-# "default" means that debug info will be included if BUILD=debug\r
-# and not included if BUILD=release. [0,1,default]\r
-!ifndef DEBUG_INFO\r
-DEBUG_INFO = default\r
-!endif\r
-\r
-# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
-# but expensive assert checks are enabled, use 0 to completely remove debugging\r
-# code. [0,1,default]\r
-!ifndef DEBUG_FLAG\r
-DEBUG_FLAG = 1\r
-!endif\r
-\r
-# Multiple libraries or single huge monolithic one? [0,1]\r
-!ifndef MONOLITHIC\r
-MONOLITHIC = 0\r
-!endif\r
-\r
-# Build GUI libraries? [0,1]\r
-!ifndef USE_GUI\r
-USE_GUI = 1\r
-!endif\r
-\r
-# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_HTML\r
-USE_HTML = 1\r
-!endif\r
-\r
-# Build multimedia library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_MEDIA\r
-USE_MEDIA = 1\r
-!endif\r
-\r
-# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_XRC\r
-USE_XRC = 1\r
-!endif\r
-\r
-# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_AUI\r
-USE_AUI = 1\r
-!endif\r
-\r
-# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_RIBBON\r
-USE_RIBBON = 1\r
-!endif\r
-\r
-# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_PROPGRID\r
-USE_PROPGRID = 1\r
-!endif\r
-\r
-# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_RICHTEXT\r
-USE_RICHTEXT = 1\r
-!endif\r
-\r
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_STC\r
-USE_STC = 1\r
-!endif\r
-\r
-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_OPENGL\r
-USE_OPENGL = 1\r
-!endif\r
-\r
-# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
-!ifndef USE_QA\r
-USE_QA = 0\r
-!endif\r
-\r
-# Enable exceptions in compiled code. [0,1]\r
-!ifndef USE_EXCEPTIONS\r
-USE_EXCEPTIONS = 1\r
-!endif\r
-\r
-# Enable run-time type information (RTTI) in compiled code. [0,1]\r
-!ifndef USE_RTTI\r
-USE_RTTI = 1\r
-!endif\r
-\r
-# Enable threading in compiled code. [0,1]\r
-!ifndef USE_THREADS\r
-USE_THREADS = 1\r
-!endif\r
-\r
-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-!ifndef USE_GDIPLUS\r
-USE_GDIPLUS = 0\r
-!endif\r
-\r
-# Is this official build by wxWidgets developers? [0,1]\r
-!ifndef OFFICIAL_BUILD\r
-OFFICIAL_BUILD = 0\r
-!endif\r
-\r
-# Use this to name your customized DLLs differently \r
-!ifndef VENDOR\r
-VENDOR = custom\r
-!endif\r
-\r
-#  \r
-!ifndef WX_FLAVOUR\r
-WX_FLAVOUR = \r
-!endif\r
-\r
-#  \r
-!ifndef WX_LIB_FLAVOUR\r
-WX_LIB_FLAVOUR = \r
-!endif\r
-\r
-# Name of your custom configuration. This affects directory\r
-# where object files are stored as well as the location of\r
-# compiled .lib files and setup.h under the lib/ toplevel directory. \r
-!ifndef CFG\r
-CFG = \r
-!endif\r
-\r
-# Compiler flags needed to compile test suite in tests directory. If you want\r
-# to run the tests, set it so that the compiler can find CppUnit headers. \r
-!ifndef CPPUNIT_CFLAGS\r
-CPPUNIT_CFLAGS = \r
-!endif\r
-\r
-# Linker flags needed to link test suite in tests directory. If you want\r
-# to run the tests, include CppUnit library here. \r
-!ifndef CPPUNIT_LIBS\r
-CPPUNIT_LIBS = \r
-!endif\r
-\r
-# Version of C runtime library to use. You can change this to\r
-# static if SHARED=0, but it is highly recommended to not do\r
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
-!ifndef RUNTIME_LIBS\r
-RUNTIME_LIBS = dynamic\r
-!endif\r
-\r
+# =========================================================================
+#     This configuration file was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
+# =========================================================================
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C compiler 
+!ifndef CC
+CC = bcc32
+!endif
+
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
+!endif
+
+# Standard flags for CC 
+!ifndef CFLAGS
+CFLAGS = 
+!endif
+
+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = -a8 -g0
+!endif
+
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = 
+!endif
+
+# The C preprocessor 
+!ifndef CPP
+CPP = cpp32 -Sr -oCON
+!endif
+
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 0
+!endif
+
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# Compile Unicode build of wxWidgets? [0,1]
+!ifndef UNICODE
+UNICODE = 1
+!endif
+
+# Use MSLU library when building Unicode version. [0,1]
+!ifndef MSLU
+MSLU = 0
+!endif
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = debug
+!endif
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+!ifndef DEBUG_INFO
+DEBUG_INFO = default
+!endif
+
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+# but expensive assert checks are enabled, use 0 to completely remove debugging
+# code. [0,1,default]
+!ifndef DEBUG_FLAG
+DEBUG_FLAG = 1
+!endif
+
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 0
+!endif
+
+# Build GUI libraries? [0,1]
+!ifndef USE_GUI
+USE_GUI = 1
+!endif
+
+# Build wxHTML library (USE_GUI must be 1)? [0,1]
+!ifndef USE_HTML
+USE_HTML = 1
+!endif
+
+# Build multimedia library (USE_GUI must be 1)? [0,1]
+!ifndef USE_MEDIA
+USE_MEDIA = 1
+!endif
+
+# Build wxXRC library (USE_GUI must be 1)? [0,1]
+!ifndef USE_XRC
+USE_XRC = 1
+!endif
+
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+!ifndef USE_AUI
+USE_AUI = 1
+!endif
+
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]
+!ifndef USE_RIBBON
+USE_RIBBON = 1
+!endif
+
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
+!ifndef USE_PROPGRID
+USE_PROPGRID = 1
+!endif
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+!ifndef USE_RICHTEXT
+USE_RICHTEXT = 1
+!endif
+
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
+!ifndef USE_STC
+USE_STC = 1
+!endif
+
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+!ifndef USE_OPENGL
+USE_OPENGL = 1
+!endif
+
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
+!ifndef USE_QA
+USE_QA = 0
+!endif
+
+# Enable exceptions in compiled code. [0,1]
+!ifndef USE_EXCEPTIONS
+USE_EXCEPTIONS = 1
+!endif
+
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+!ifndef USE_RTTI
+USE_RTTI = 1
+!endif
+
+# Enable threading in compiled code. [0,1]
+!ifndef USE_THREADS
+USE_THREADS = 1
+!endif
+
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
+!ifndef USE_GDIPLUS
+USE_GDIPLUS = 0
+!endif
+
+# Is this official build by wxWidgets developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0
+!endif
+
+# Use this to name your customized DLLs differently 
+!ifndef VENDOR
+VENDOR = custom
+!endif
+
+#  
+!ifndef WX_FLAVOUR
+WX_FLAVOUR = 
+!endif
+
+#  
+!ifndef WX_LIB_FLAVOUR
+WX_LIB_FLAVOUR = 
+!endif
+
+# Name of your custom configuration. This affects directory
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 
+!ifndef CFG
+CFG = 
+!endif
+
+# Compiler flags needed to compile test suite in tests directory. If you want
+# to run the tests, set it so that the compiler can find CppUnit headers. 
+!ifndef CPPUNIT_CFLAGS
+CPPUNIT_CFLAGS = 
+!endif
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+!ifndef CPPUNIT_LIBS
+CPPUNIT_LIBS = 
+!endif
+
+# Version of C runtime library to use. You can change this to
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]
+!ifndef RUNTIME_LIBS
+RUNTIME_LIBS = dynamic
+!endif
+

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index 3dbf94ba4890fd70da146741332753383db33aec..2acccb6fba5695caec00faed6588d02f2d93ba1f 100644 (file)
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -1,147 +1,147 @@
-# =========================================================================\r
-#     This configuration file was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Beware that all changes made to this file will be overwritten next\r
-#     time you run Bakefile!\r
-# =========================================================================\r
-\r
-\r
-# -------------------------------------------------------------------------\r
-# These are configurable options:\r
-# -------------------------------------------------------------------------\r
-\r
-# Compiler flags to link shared library \r
-LINK_DLL_FLAGS ?= -shared\r
-\r
-# Compiler flags to link loadable module \r
-LINK_MODULE_FLAGS ?= -shared\r
-\r
-# C compiler \r
-CC = gcc\r
-\r
-# C++ compiler \r
-CXX = g++\r
-\r
-# Standard flags for CC \r
-CFLAGS ?= \r
-\r
-# Standard flags for C++ \r
-CXXFLAGS ?= \r
-\r
-# Standard preprocessor flags (common for CC and CXX) \r
-CPPFLAGS ?= \r
-\r
-# Standard linker flags \r
-LDFLAGS ?= \r
-\r
-# The C preprocessor \r
-CPP ?= $(CC) -E\r
-\r
-# What type of library to build? [0,1]\r
-SHARED ?= 0\r
-\r
-# Build wxUniversal instead of native port? [0,1]\r
-WXUNIV ?= 0\r
-\r
-# Compile Unicode build of wxWidgets? [0,1]\r
-UNICODE ?= 1\r
-\r
-# Use MSLU library when building Unicode version. [0,1]\r
-MSLU ?= 0\r
-\r
-# Type of compiled binaries [debug,release]\r
-BUILD ?= debug\r
-\r
-# Should debugging info be included in the executables? The default value\r
-# "default" means that debug info will be included if BUILD=debug\r
-# and not included if BUILD=release. [0,1,default]\r
-DEBUG_INFO ?= default\r
-\r
-# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
-# but expensive assert checks are enabled, use 0 to completely remove debugging\r
-# code. [0,1,default]\r
-DEBUG_FLAG ?= 1\r
-\r
-# Multiple libraries or single huge monolithic one? [0,1]\r
-MONOLITHIC ?= 0\r
-\r
-# Build GUI libraries? [0,1]\r
-USE_GUI ?= 1\r
-\r
-# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
-USE_HTML ?= 1\r
-\r
-# Build multimedia library (USE_GUI must be 1)? [0,1]\r
-USE_MEDIA ?= 1\r
-\r
-# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
-USE_XRC ?= 1\r
-\r
-# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
-USE_AUI ?= 1\r
-\r
-# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
-USE_RIBBON ?= 1\r
-\r
-# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
-USE_PROPGRID ?= 1\r
-\r
-# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_RICHTEXT ?= 1\r
-\r
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_STC ?= 1\r
-\r
-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
-USE_OPENGL ?= 1\r
-\r
-# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
-USE_QA ?= 0\r
-\r
-# Enable exceptions in compiled code. [0,1]\r
-USE_EXCEPTIONS ?= 1\r
-\r
-# Enable run-time type information (RTTI) in compiled code. [0,1]\r
-USE_RTTI ?= 1\r
-\r
-# Enable threading in compiled code. [0,1]\r
-USE_THREADS ?= 1\r
-\r
-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-USE_GDIPLUS ?= 0\r
-\r
-# Is this official build by wxWidgets developers? [0,1]\r
-OFFICIAL_BUILD ?= 0\r
-\r
-# Use this to name your customized DLLs differently \r
-VENDOR ?= custom\r
-\r
-#  \r
-WX_FLAVOUR ?= \r
-\r
-#  \r
-WX_LIB_FLAVOUR ?= \r
-\r
-# Name of your custom configuration. This affects directory\r
-# where object files are stored as well as the location of\r
-# compiled .lib files and setup.h under the lib/ toplevel directory. \r
-CFG ?= \r
-\r
-# Compiler flags needed to compile test suite in tests directory. If you want\r
-# to run the tests, set it so that the compiler can find CppUnit headers. \r
-CPPUNIT_CFLAGS ?= \r
-\r
-# Linker flags needed to link test suite in tests directory. If you want\r
-# to run the tests, include CppUnit library here. \r
-CPPUNIT_LIBS ?= \r
-\r
-# Version of C runtime library to use. You can change this to\r
-# static if SHARED=0, but it is highly recommended to not do\r
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
-RUNTIME_LIBS ?= dynamic\r
-\r
-# Set the version of your Mingw installation here.\r
-#     "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)\r
-#     "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]\r
-GCC_VERSION ?= 3\r
-\r
+# =========================================================================
+#     This configuration file was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
+# =========================================================================
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# Compiler flags to link shared library 
+LINK_DLL_FLAGS ?= -shared
+
+# Compiler flags to link loadable module 
+LINK_MODULE_FLAGS ?= -shared
+
+# C compiler 
+CC = gcc
+
+# C++ compiler 
+CXX = g++
+
+# Standard flags for CC 
+CFLAGS ?= 
+
+# Standard flags for C++ 
+CXXFLAGS ?= 
+
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS ?= 
+
+# Standard linker flags 
+LDFLAGS ?= 
+
+# The C preprocessor 
+CPP ?= $(CC) -E
+
+# What type of library to build? [0,1]
+SHARED ?= 0
+
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV ?= 0
+
+# Compile Unicode build of wxWidgets? [0,1]
+UNICODE ?= 1
+
+# Use MSLU library when building Unicode version. [0,1]
+MSLU ?= 0
+
+# Type of compiled binaries [debug,release]
+BUILD ?= debug
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO ?= default
+
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+# but expensive assert checks are enabled, use 0 to completely remove debugging
+# code. [0,1,default]
+DEBUG_FLAG ?= 1
+
+# Multiple libraries or single huge monolithic one? [0,1]
+MONOLITHIC ?= 0
+
+# Build GUI libraries? [0,1]
+USE_GUI ?= 1
+
+# Build wxHTML library (USE_GUI must be 1)? [0,1]
+USE_HTML ?= 1
+
+# Build multimedia library (USE_GUI must be 1)? [0,1]
+USE_MEDIA ?= 1
+
+# Build wxXRC library (USE_GUI must be 1)? [0,1]
+USE_XRC ?= 1
+
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+USE_AUI ?= 1
+
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]
+USE_RIBBON ?= 1
+
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
+USE_PROPGRID ?= 1
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_RICHTEXT ?= 1
+
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_STC ?= 1
+
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+USE_OPENGL ?= 1
+
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
+USE_QA ?= 0
+
+# Enable exceptions in compiled code. [0,1]
+USE_EXCEPTIONS ?= 1
+
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+USE_RTTI ?= 1
+
+# Enable threading in compiled code. [0,1]
+USE_THREADS ?= 1
+
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
+USE_GDIPLUS ?= 0
+
+# Is this official build by wxWidgets developers? [0,1]
+OFFICIAL_BUILD ?= 0
+
+# Use this to name your customized DLLs differently 
+VENDOR ?= custom
+
+#  
+WX_FLAVOUR ?= 
+
+#  
+WX_LIB_FLAVOUR ?= 
+
+# Name of your custom configuration. This affects directory
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG ?= 
+
+# Compiler flags needed to compile test suite in tests directory. If you want
+# to run the tests, set it so that the compiler can find CppUnit headers. 
+CPPUNIT_CFLAGS ?= 
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+CPPUNIT_LIBS ?= 
+
+# Version of C runtime library to use. You can change this to
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]
+RUNTIME_LIBS ?= dynamic
+
+# Set the version of your Mingw installation here.
+#     "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
+#     "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
+GCC_VERSION ?= 3
+

diff --git a/build/msw/config.vc b/build/msw/config.vc
index bd4f64f857a0786d5fc7e75cabede688e86b246d..3e2df0b726fd20261955928b3c242ccbd1f4d70c 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,149 +1,149 @@
-# =========================================================================\r
-#     This configuration file was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Beware that all changes made to this file will be overwritten next\r
-#     time you run Bakefile!\r
-# =========================================================================\r
-\r
-\r
-# -------------------------------------------------------------------------\r
-# These are configurable options:\r
-# -------------------------------------------------------------------------\r
-\r
-# C compiler \r
-CC = cl\r
-\r
-# C++ compiler \r
-CXX = cl\r
-\r
-# Standard flags for CC \r
-CFLAGS = \r
-\r
-# Standard flags for C++ \r
-CXXFLAGS = \r
-\r
-# Standard preprocessor flags (common for CC and CXX) \r
-CPPFLAGS = \r
-\r
-# Standard linker flags \r
-LDFLAGS = \r
-\r
-# The C preprocessor \r
-CPP = $(CC) /EP /nologo\r
-\r
-# What type of library to build? [0,1]\r
-SHARED = 0\r
-\r
-# Build wxUniversal instead of native port? [0,1]\r
-WXUNIV = 0\r
-\r
-# Compile Unicode build of wxWidgets? [0,1]\r
-UNICODE = 1\r
-\r
-# Use MSLU library when building Unicode version. [0,1]\r
-MSLU = 0\r
-\r
-# Type of compiled binaries [debug,release]\r
-BUILD = debug\r
-\r
-# The target processor architecture must be specified when it is not X86.\r
-# This does not affect the compiler output, so you still need to make sure\r
-# your environment is set up appropriately with the correct compiler in the\r
-# PATH. Rather it affects some options passed to some of the common build\r
-# utilities such as the resource compiler and the linker.\r
-# \r
-# Accepted values: AMD64, IA64. \r
-TARGET_CPU = $(CPU)\r
-\r
-# Should debugging info be included in the executables? The default value\r
-# "default" means that debug info will be included if BUILD=debug\r
-# and not included if BUILD=release. [0,1,default]\r
-DEBUG_INFO = 1\r
-\r
-# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
-# but expensive assert checks are enabled, use 0 to completely remove debugging\r
-# code. [0,1,default]\r
-DEBUG_FLAG = 1\r
-\r
-# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?\r
-# Default is to use debug CRT if and only if BUILD==debug. [0,1,default]\r
-DEBUG_RUNTIME_LIBS = default\r
-\r
-# Multiple libraries or single huge monolithic one? [0,1]\r
-MONOLITHIC = 0\r
-\r
-# Build GUI libraries? [0,1]\r
-USE_GUI = 1\r
-\r
-# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
-USE_HTML = 1\r
-\r
-# Build multimedia library (USE_GUI must be 1)? [0,1]\r
-USE_MEDIA = 1\r
-\r
-# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
-USE_XRC = 1\r
-\r
-# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
-USE_AUI = 1\r
-\r
-# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
-USE_RIBBON = 1\r
-\r
-# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
-USE_PROPGRID = 1\r
-\r
-# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_RICHTEXT = 1\r
-\r
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_STC = 1\r
-\r
-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
-USE_OPENGL = 1\r
-\r
-# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
-USE_QA = 1\r
-\r
-# Enable exceptions in compiled code. [0,1]\r
-USE_EXCEPTIONS = 1\r
-\r
-# Enable run-time type information (RTTI) in compiled code. [0,1]\r
-USE_RTTI = 1\r
-\r
-# Enable threading in compiled code. [0,1]\r
-USE_THREADS = 1\r
-\r
-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-USE_GDIPLUS = 0\r
-\r
-# Is this official build by wxWidgets developers? [0,1]\r
-OFFICIAL_BUILD = 0\r
-\r
-# Use this to name your customized DLLs differently \r
-VENDOR = custom\r
-\r
-#  \r
-WX_FLAVOUR = \r
-\r
-#  \r
-WX_LIB_FLAVOUR = \r
-\r
-# Name of your custom configuration. This affects directory\r
-# where object files are stored as well as the location of\r
-# compiled .lib files and setup.h under the lib/ toplevel directory. \r
-CFG = \r
-\r
-# Compiler flags needed to compile test suite in tests directory. If you want\r
-# to run the tests, set it so that the compiler can find CppUnit headers. \r
-CPPUNIT_CFLAGS = \r
-\r
-# Linker flags needed to link test suite in tests directory. If you want\r
-# to run the tests, include CppUnit library here. \r
-CPPUNIT_LIBS = \r
-\r
-# Version of C runtime library to use. You can change this to\r
-# static if SHARED=0, but it is highly recommended to not do\r
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
-RUNTIME_LIBS = dynamic\r
-\r
+# =========================================================================
+#     This configuration file was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
+# =========================================================================
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C compiler 
+CC = cl
+
+# C++ compiler 
+CXX = cl
+
+# Standard flags for CC 
+CFLAGS = 
+
+# Standard flags for C++ 
+CXXFLAGS = 
+
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS = 
+
+# Standard linker flags 
+LDFLAGS = 
+
+# The C preprocessor 
+CPP = $(CC) /EP /nologo
+
+# What type of library to build? [0,1]
+SHARED = 0
+
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV = 0
+
+# Compile Unicode build of wxWidgets? [0,1]
+UNICODE = 1
+
+# Use MSLU library when building Unicode version. [0,1]
+MSLU = 0
+
+# Type of compiled binaries [debug,release]
+BUILD = debug
+
+# The target processor architecture must be specified when it is not X86.
+# This does not affect the compiler output, so you still need to make sure
+# your environment is set up appropriately with the correct compiler in the
+# PATH. Rather it affects some options passed to some of the common build
+# utilities such as the resource compiler and the linker.
+# 
+# Accepted values: AMD64, IA64. 
+TARGET_CPU = $(CPU)
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO = 1
+
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+# but expensive assert checks are enabled, use 0 to completely remove debugging
+# code. [0,1,default]
+DEBUG_FLAG = 1
+
+# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?
+# Default is to use debug CRT if and only if BUILD==debug. [0,1,default]
+DEBUG_RUNTIME_LIBS = default
+
+# Multiple libraries or single huge monolithic one? [0,1]
+MONOLITHIC = 0
+
+# Build GUI libraries? [0,1]
+USE_GUI = 1
+
+# Build wxHTML library (USE_GUI must be 1)? [0,1]
+USE_HTML = 1
+
+# Build multimedia library (USE_GUI must be 1)? [0,1]
+USE_MEDIA = 1
+
+# Build wxXRC library (USE_GUI must be 1)? [0,1]
+USE_XRC = 1
+
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+USE_AUI = 1
+
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]
+USE_RIBBON = 1
+
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
+USE_PROPGRID = 1
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_RICHTEXT = 1
+
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_STC = 1
+
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+USE_OPENGL = 1
+
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
+USE_QA = 1
+
+# Enable exceptions in compiled code. [0,1]
+USE_EXCEPTIONS = 1
+
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+USE_RTTI = 1
+
+# Enable threading in compiled code. [0,1]
+USE_THREADS = 1
+
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
+USE_GDIPLUS = 0
+
+# Is this official build by wxWidgets developers? [0,1]
+OFFICIAL_BUILD = 0
+
+# Use this to name your customized DLLs differently 
+VENDOR = custom
+
+#  
+WX_FLAVOUR = 
+
+#  
+WX_LIB_FLAVOUR = 
+
+# Name of your custom configuration. This affects directory
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+
+# Compiler flags needed to compile test suite in tests directory. If you want
+# to run the tests, set it so that the compiler can find CppUnit headers. 
+CPPUNIT_CFLAGS = 
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+CPPUNIT_LIBS = 
+
+# Version of C runtime library to use. You can change this to
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]
+RUNTIME_LIBS = dynamic
+

diff --git a/build/msw/config.wat b/build/msw/config.wat
index 5cdb76bb8e7a6620a3dd6e477f71578a418f22e1..9ecace6fd2fb5dc555d4817f15089447ee022e5c 100644 (file)
--- a/build/msw/config.wat
+++ b/build/msw/config.wat
@@ -1,140 +1,140 @@
-# =========================================================================\r
-#     This configuration file was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Beware that all changes made to this file will be overwritten next\r
-#     time you run Bakefile!\r
-# =========================================================================\r
-\r
-\r
-# -------------------------------------------------------------------------\r
-# These are configurable options:\r
-# -------------------------------------------------------------------------\r
-\r
-# C compiler \r
-CC = wcc386\r
-\r
-# C++ compiler \r
-CXX = wpp386\r
-\r
-# Standard flags for CC \r
-CFLAGS = \r
-\r
-# Standard flags for C++ \r
-CXXFLAGS = \r
-\r
-# Standard preprocessor flags (common for CC and CXX) \r
-CPPFLAGS = \r
-\r
-# Standard linker flags \r
-LDFLAGS = \r
-\r
-# The C preprocessor \r
-CPP = $(CC) -p\r
-\r
-# What type of library to build? [0,1]\r
-#   1 - DLL\r
-SHARED = 0\r
-\r
-# Build wxUniversal instead of native port? [0,1]\r
-#   1 - Universal\r
-WXUNIV = 0\r
-\r
-# Compile Unicode build of wxWidgets? [0,1]\r
-#   1 - Unicode\r
-UNICODE = 1\r
-\r
-# Type of compiled binaries [debug,release]\r
-BUILD = debug\r
-\r
-# Should debugging info be included in the executables? The default value\r
-# "default" means that debug info will be included if BUILD=debug\r
-# and not included if BUILD=release. [0,1,default]\r
-DEBUG_INFO = default\r
-\r
-# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
-# but expensive assert checks are enabled, use 0 to completely remove debugging\r
-# code. [0,1,default]\r
-DEBUG_FLAG = 1\r
-\r
-# Multiple libraries or single huge monolithic one? [0,1]\r
-#   0 - Multilib\r
-#   1 - Monolithic\r
-MONOLITHIC = 1\r
-\r
-# Build GUI libraries? [0,1]\r
-#   0 - Base\r
-#   1 - GUI\r
-USE_GUI = 1\r
-\r
-# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
-USE_HTML = 1\r
-\r
-# Build multimedia library (USE_GUI must be 1)? [0,1]\r
-USE_MEDIA = 1\r
-\r
-# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
-USE_XRC = 1\r
-\r
-# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
-USE_AUI = 1\r
-\r
-# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
-USE_RIBBON = 1\r
-\r
-# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
-USE_PROPGRID = 1\r
-\r
-# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_RICHTEXT = 1\r
-\r
-# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
-USE_STC = 1\r
-\r
-# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
-USE_OPENGL = 1\r
-\r
-# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
-USE_QA = 0\r
-\r
-# Enable exceptions in compiled code. [0,1]\r
-USE_EXCEPTIONS = 1\r
-\r
-# Enable run-time type information (RTTI) in compiled code. [0,1]\r
-USE_RTTI = 1\r
-\r
-# Enable threading in compiled code. [0,1]\r
-USE_THREADS = 1\r
-\r
-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-USE_GDIPLUS = 0\r
-\r
-# Is this official build by wxWidgets developers? [0,1]\r
-OFFICIAL_BUILD = 0\r
-\r
-# Use this to name your customized DLLs differently \r
-VENDOR = custom\r
-\r
-#  \r
-WX_FLAVOUR = \r
-\r
-#  \r
-WX_LIB_FLAVOUR = \r
-\r
-# Name of your custom configuration. This affects directory\r
-# where object files are stored as well as the location of\r
-# compiled .lib files and setup.h under the lib/ toplevel directory. \r
-CFG = \r
-\r
-# Compiler flags needed to compile test suite in tests directory. If you want\r
-# to run the tests, set it so that the compiler can find CppUnit headers. \r
-CPPUNIT_CFLAGS = \r
-\r
-# Linker flags needed to link test suite in tests directory. If you want\r
-# to run the tests, include CppUnit library here. \r
-CPPUNIT_LIBS = \r
-\r
-# Version of C runtime library to use. You can change this to\r
-# static if SHARED=0, but it is highly recommended to not do\r
-# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
-RUNTIME_LIBS = dynamic\r
-\r
+# =========================================================================
+#     This configuration file was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Beware that all changes made to this file will be overwritten next
+#     time you run Bakefile!
+# =========================================================================
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C compiler 
+CC = wcc386
+
+# C++ compiler 
+CXX = wpp386
+
+# Standard flags for CC 
+CFLAGS = 
+
+# Standard flags for C++ 
+CXXFLAGS = 
+
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS = 
+
+# Standard linker flags 
+LDFLAGS = 
+
+# The C preprocessor 
+CPP = $(CC) -p
+
+# What type of library to build? [0,1]
+#   1 - DLL
+SHARED = 0
+
+# Build wxUniversal instead of native port? [0,1]
+#   1 - Universal
+WXUNIV = 0
+
+# Compile Unicode build of wxWidgets? [0,1]
+#   1 - Unicode
+UNICODE = 1
+
+# Type of compiled binaries [debug,release]
+BUILD = debug
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO = default
+
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+# but expensive assert checks are enabled, use 0 to completely remove debugging
+# code. [0,1,default]
+DEBUG_FLAG = 1
+
+# Multiple libraries or single huge monolithic one? [0,1]
+#   0 - Multilib
+#   1 - Monolithic
+MONOLITHIC = 1
+
+# Build GUI libraries? [0,1]
+#   0 - Base
+#   1 - GUI
+USE_GUI = 1
+
+# Build wxHTML library (USE_GUI must be 1)? [0,1]
+USE_HTML = 1
+
+# Build multimedia library (USE_GUI must be 1)? [0,1]
+USE_MEDIA = 1
+
+# Build wxXRC library (USE_GUI must be 1)? [0,1]
+USE_XRC = 1
+
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+USE_AUI = 1
+
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]
+USE_RIBBON = 1
+
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]
+USE_PROPGRID = 1
+
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_RICHTEXT = 1
+
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]
+USE_STC = 1
+
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+USE_OPENGL = 1
+
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
+USE_QA = 0
+
+# Enable exceptions in compiled code. [0,1]
+USE_EXCEPTIONS = 1
+
+# Enable run-time type information (RTTI) in compiled code. [0,1]
+USE_RTTI = 1
+
+# Enable threading in compiled code. [0,1]
+USE_THREADS = 1
+
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
+USE_GDIPLUS = 0
+
+# Is this official build by wxWidgets developers? [0,1]
+OFFICIAL_BUILD = 0
+
+# Use this to name your customized DLLs differently 
+VENDOR = custom
+
+#  
+WX_FLAVOUR = 
+
+#  
+WX_LIB_FLAVOUR = 
+
+# Name of your custom configuration. This affects directory
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+
+# Compiler flags needed to compile test suite in tests directory. If you want
+# to run the tests, set it so that the compiler can find CppUnit headers. 
+CPPUNIT_CFLAGS = 
+
+# Linker flags needed to link test suite in tests directory. If you want
+# to run the tests, include CppUnit library here. 
+CPPUNIT_LIBS = 
+
+# Version of C runtime library to use. You can change this to
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]
+RUNTIME_LIBS = dynamic
+

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index b5ac096ccb2695dbea50e1f7013bd01218681cc3..a38a6b2e437625216c27fbc9535ae752c87c6a3b 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -1430,7 +1430,7 @@ PORTNAME = msw
 VENDORTAG = _$(VENDOR)
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG =
+VENDORTAG = 
 !endif
 !if "$(BUILD)" == "debug"
 WXDEBUGFLAG = d
@@ -1460,10 +1460,10 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 __monodll___depname = \
@@ -4209,7 +4209,7 @@ __htmldll_library_link_LIBR = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_13 =
+__THREADSFLAG_13 = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_13 = mt
@@ -4218,7 +4218,7 @@ __THREADSFLAG_13 = mt
 __RUNTIME_LIBS_5 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_5 =
+__RUNTIME_LIBS_5 = 
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__
@@ -4281,7 +4281,7 @@ __OPTIMIZEFLAG = -Od
 __OPTIMIZEFLAG = -O2
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG =
+__THREADSFLAG = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG = -tWM
@@ -4290,7 +4290,7 @@ __THREADSFLAG = -tWM
 __RUNTIME_LIBS = -tWR
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS =
+__RUNTIME_LIBS = 
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -4335,7 +4335,7 @@ $(OBJS):
 
 all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
@@ -4847,13 +4847,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 !endif
 
-samples:
+samples: 
        @echo cd ..\..\samples >$(OBJS)\samples.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat
        call $(OBJS)\samples.bat
        @del $(OBJS)\samples.bat
 
-$(LIBDIRNAME):
+$(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(SETUPHDIR): $(LIBDIRNAME)
@@ -4862,10 +4862,10 @@ $(SETUPHDIR): $(LIBDIRNAME)
 $(SETUPHDIR)\wx: $(SETUPHDIR)
        if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
 
-..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h:
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: 
        if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
 
-$(SETUPHDIR)\wx\setup.h:
+$(SETUPHDIR)\wx\setup.h: 
        if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index e338931b6fe2190f5a06c75401046e7b2f883759..595abee5a8a36b54aba6e074f6a0bc05af035793 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -1446,7 +1446,7 @@ ifeq ($(OFFICIAL_BUILD),0)
 VENDORTAG = _$(VENDOR)
 endif
 ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG =
+VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)
 WXDEBUGFLAG = d
@@ -1476,10 +1476,10 @@ ifeq ($(USE_GUI),1)
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
 endif
 ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 endif
 ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
@@ -4425,11 +4425,11 @@ endif
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 endif
 ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
@@ -4441,7 +4441,7 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
+__THREADSFLAG = 
 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
@@ -4450,13 +4450,13 @@ ifeq ($(USE_RTTI),0)
 __RTTIFLAG = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)
-__RTTIFLAG =
+__RTTIFLAG = 
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -4501,7 +4501,7 @@ $(OBJS):
 
 all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
-clean:
+clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
@@ -5008,10 +5008,10 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 endif
 endif
 
-samples:
+samples: 
        $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
 
-$(LIBDIRNAME):
+$(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(SETUPHDIR): $(LIBDIRNAME)
@@ -5020,10 +5020,10 @@ $(SETUPHDIR): $(LIBDIRNAME)
 $(SETUPHDIR)\wx: $(SETUPHDIR)
        if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
 
-..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h:
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: 
        if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
 
-$(SETUPHDIR)\wx\setup.h:
+$(SETUPHDIR)\wx\setup.h: 
        if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 81bef6c8fe28a7057442d1f8f3afd39b3ea1f294..8e6d797eab07e3041cc4457ee6ced73ca38cf8d9 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -37,19 +37,20 @@ LIBDIRNAME = \
        ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
+       $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       /DNDEBUG /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS)
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__DEBUGINFO_17) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       $(CPPFLAGS) $(CFLAGS)
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        $(OBJS)\wxzlib_compress.obj \
@@ -63,10 +64,10 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infback.obj \
        $(OBJS)\wxzlib_inftrees.obj \
        $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \
-       $(CFLAGS)
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__DEBUGINFO_32) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        $(OBJS)\wxpng_pngerror.obj \
@@ -85,10 +86,10 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \
-       $(CFLAGS)
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__DEBUGINFO_47) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \
@@ -136,10 +137,11 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \
-       /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__DEBUGINFO_62) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I..\..\src\zlib /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) \
+       $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        $(OBJS)\wxtiff_tif_aux.obj \
@@ -177,20 +179,20 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(__DEBUGINFO_77) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       /DNDEBUG /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
-WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \
+WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUGINFO_92) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       /DNDEBUG /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src \
+       /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
 WXSCINTILLA_OBJECTS =  \
        $(OBJS)\wxscintilla_AutoComplete.obj \
        $(OBJS)\wxscintilla_CallTip.obj \
@@ -284,30 +286,30 @@ WXSCINTILLA_OBJECTS =  \
        $(OBJS)\wxscintilla_ViewStyle.obj \
        $(OBJS)\wxscintilla_WindowAccessor.obj \
        $(OBJS)\wxscintilla_XPM.obj
-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
-       /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
-       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
-       $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
-       /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
-       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
+       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
+       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
@@ -436,28 +438,30 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_xtixml.obj
 MONODLL_RESOURCES =  \
        $(OBJS)\monodll_version.res
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
+       $(CFLAGS)
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
@@ -584,27 +588,29 @@ MONOLIB_OBJECTS =  \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj \
        $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
+       $(CPPFLAGS) $(CFLAGS)
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_any.obj \
@@ -717,27 +723,28 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_volume.obj
 BASEDLL_RESOURCES =  \
        $(OBJS)\basedll_version.res
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_any.obj \
@@ -848,17 +855,18 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_170) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \
@@ -875,17 +883,17 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_urlmsw.obj
 NETDLL_RESOURCES =  \
        $(OBJS)\netdll_version.res
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_185) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
@@ -900,17 +908,18 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_url.obj \
        $(OBJS)\netlib_sockmsw.obj \
        $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_201) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_event.obj \
@@ -924,17 +933,17 @@ COREDLL_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
 COREDLL_RESOURCES =  \
        $(OBJS)\coredll_version.res
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_194)$(__DEBUGRUNTIME) /DWIN32 \
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_216) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
        $(OBJS)\corelib_event.obj \
@@ -946,47 +955,49 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_232) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVDLL_RESOURCES =  \
        $(OBJS)\advdll_version.res
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_247) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_263) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_dummy.obj \
        $(OBJS)\mediadll_mediactrlcmn.obj \
@@ -995,34 +1006,35 @@ MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_mediactrl_qt.obj
 MEDIADLL_RESOURCES =  \
        $(OBJS)\mediadll_version.res
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_278) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
 MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_dummy.obj \
        $(OBJS)\medialib_mediactrlcmn.obj \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
        $(OBJS)\medialib_mediactrl_qt.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_294) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \
@@ -1051,17 +1063,17 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_htmllbox.obj
 HTMLDLL_RESOURCES =  \
        $(OBJS)\htmldll_version.res
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_309) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \
@@ -1088,81 +1100,84 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_325) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(OBJS)\qadll_dummy.obj \
        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj
 QADLL_RESOURCES =  \
        $(OBJS)\qadll_version.res
-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_340) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
 QALIB_OBJECTS =  \
        $(OBJS)\qalib_dummy.obj \
        $(OBJS)\qalib_debugrpt.obj \
        $(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_356) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj \
        $(OBJS)\xmldll_xtixml.obj
 XMLDLL_RESOURCES =  \
        $(OBJS)\xmldll_version.res
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_371) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj \
        $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_387) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.obj \
        $(OBJS)\xrcdll_xh_animatctrl.obj \
@@ -1228,17 +1243,17 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xmlrsall.obj
 XRCDLL_RESOURCES =  \
        $(OBJS)\xrcdll_version.res
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_402) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_dummy.obj \
        $(OBJS)\xrclib_xh_animatctrl.obj \
@@ -1302,17 +1317,18 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xmlres.obj \
        $(OBJS)\xrclib_xmladv.obj \
        $(OBJS)\xrclib_xmlrsall.obj
-AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_418) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auidll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_dummy.obj \
        $(OBJS)\auidll_framemanager.obj \
@@ -1323,17 +1339,17 @@ AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_tabmdi.obj
 AUIDLL_RESOURCES =  \
        $(OBJS)\auidll_version.res
-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_433) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)
 AUILIB_OBJECTS =  \
        $(OBJS)\auilib_dummy.obj \
        $(OBJS)\auilib_framemanager.obj \
@@ -1342,17 +1358,18 @@ AUILIB_OBJECTS =  \
        $(OBJS)\auilib_auibook.obj \
        $(OBJS)\auilib_auibar.obj \
        $(OBJS)\auilib_tabmdi.obj
-RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_449) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbondll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 RIBBONDLL_OBJECTS =  \
        $(OBJS)\ribbondll_dummy.obj \
        $(OBJS)\ribbondll_art_internal.obj \
@@ -1367,17 +1384,17 @@ RIBBONDLL_OBJECTS =  \
        $(OBJS)\ribbondll_toolbar.obj
 RIBBONDLL_RESOURCES =  \
        $(OBJS)\ribbondll_version.res
-RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_464) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_ribbonlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 RIBBONLIB_OBJECTS =  \
        $(OBJS)\ribbonlib_dummy.obj \
        $(OBJS)\ribbonlib_art_internal.obj \
@@ -1390,17 +1407,18 @@ RIBBONLIB_OBJECTS =  \
        $(OBJS)\ribbonlib_page.obj \
        $(OBJS)\ribbonlib_panel.obj \
        $(OBJS)\ribbonlib_toolbar.obj
-PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_480) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgriddll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_dummy.obj \
        $(OBJS)\propgriddll_advprops.obj \
@@ -1413,17 +1431,17 @@ PROPGRIDDLL_OBJECTS =  \
        $(OBJS)\propgriddll_props.obj
 PROPGRIDDLL_RESOURCES =  \
        $(OBJS)\propgriddll_version.res
-PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_495) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_propgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 PROPGRIDLIB_OBJECTS =  \
        $(OBJS)\propgridlib_dummy.obj \
        $(OBJS)\propgridlib_advprops.obj \
@@ -1434,17 +1452,18 @@ PROPGRIDLIB_OBJECTS =  \
        $(OBJS)\propgridlib_propgridiface.obj \
        $(OBJS)\propgridlib_propgridpagestate.obj \
        $(OBJS)\propgridlib_props.obj
-RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_511) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_dummy.obj \
        $(OBJS)\richtextdll_richtextctrl.obj \
@@ -1458,17 +1477,17 @@ RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_richtextprint.obj
 RICHTEXTDLL_RESOURCES =  \
        $(OBJS)\richtextdll_version.res
-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_526) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_dummy.obj \
        $(OBJS)\richtextlib_richtextctrl.obj \
@@ -1480,19 +1499,19 @@ RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj
-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_542) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \
+       /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_dummy.obj \
        $(OBJS)\stcdll_stc.obj \
@@ -1500,51 +1519,53 @@ STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_ScintillaWX.obj
 STCDLL_RESOURCES =  \
        $(OBJS)\stcdll_version.res
-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_491)$(__DEBUGRUNTIME) /DWIN32 \
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
-       /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       $(__DEBUGINFO_557) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \
+       /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS)
 STCLIB_OBJECTS =  \
        $(OBJS)\stclib_dummy.obj \
        $(OBJS)\stclib_stc.obj \
        $(OBJS)\stclib_PlatWX.obj \
        $(OBJS)\stclib_ScintillaWX.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_505)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_573) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcmn.obj \
        $(OBJS)\gldll_glcanvas.obj
 GLDLL_RESOURCES =  \
        $(OBJS)\gldll_version.res
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_518)$(__DEBUGRUNTIME) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUGINFO_588) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcmn.obj \
@@ -1563,7 +1584,7 @@ PORTNAME = msw
 VENDORTAG = _$(VENDOR)
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG =
+VENDORTAG = 
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 WXDEBUGFLAG = d
@@ -1610,72 +1631,168 @@ LINK_TARGET_CPU = /MACHINE:AMD64
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
+__RUNTIME_LIBS_10 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_17 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_17 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_17 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_17 = $(__DEBUGRUNTIME_40)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_21 = D
+__RUNTIME_LIBS_25 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_21 = $(__THREADSFLAG)
+__RUNTIME_LIBS_25 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_32 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_32 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_32 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_32 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_34 = D
+__RUNTIME_LIBS_40 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_34 = $(__THREADSFLAG)
+__RUNTIME_LIBS_40 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_47 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_47 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_47 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_47 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_47 = D
+__RUNTIME_LIBS_55 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_47 = $(__THREADSFLAG)
+__RUNTIME_LIBS_55 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_62 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_62 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_62 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_62 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_60 = D
+__RUNTIME_LIBS_70 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_60 = $(__THREADSFLAG)
+__RUNTIME_LIBS_70 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_77 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_77 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_77 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_77 = $(__DEBUGRUNTIME_40)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_73 = D
+__RUNTIME_LIBS_85 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_73 = $(__THREADSFLAG)
+__RUNTIME_LIBS_85 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_92 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_92 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_92 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_92 = $(__DEBUGRUNTIME_40)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_86 = D
+__RUNTIME_LIBS_100 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_86 = $(__THREADSFLAG)
+__RUNTIME_LIBS_100 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 __monodll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_100 = D
+__RUNTIME_LIBS_116 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_100 = $(__THREADSFLAG)
+__RUNTIME_LIBS_116 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
@@ -2375,11 +2492,23 @@ __wxscintilla_library_link_DEP = $(__wxscintilla)
 __monolib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_123 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_123 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_123 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_123 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_113 = D
+__RUNTIME_LIBS_131 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_113 = $(__THREADSFLAG)
+__RUNTIME_LIBS_131 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
@@ -3076,21 +3205,45 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 __basedll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_127 = D
+__RUNTIME_LIBS_147 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_127 = $(__THREADSFLAG)
+__RUNTIME_LIBS_147 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __baselib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_154 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_154 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_154 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_154 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_140 = D
+__RUNTIME_LIBS_162 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_140 = $(__THREADSFLAG)
+__RUNTIME_LIBS_162 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxbase_namedll_DEP = $(__basedll___depname)
@@ -3102,21 +3255,45 @@ ____wxbase_namelib_DEP = $(__baselib___depname)
 __netdll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_154 = D
+__RUNTIME_LIBS_178 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_154 = $(__THREADSFLAG)
+__RUNTIME_LIBS_178 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_185 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_185 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_185 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_185 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_167 = D
+__RUNTIME_LIBS_193 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_167 = $(__THREADSFLAG)
+__RUNTIME_LIBS_193 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxnet_namedll_DEP = $(__netdll___depname)
@@ -3128,11 +3305,23 @@ ____wxnet_namelib_DEP = $(__netlib___depname)
 __coredll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_181 = D
+__RUNTIME_LIBS_209 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_181 = $(__THREADSFLAG)
+__RUNTIME_LIBS_209 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -3621,11 +3810,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 __corelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_216 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_216 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_216 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_216 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_194 = D
+__RUNTIME_LIBS_224 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_194 = $(__THREADSFLAG)
+__RUNTIME_LIBS_224 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -4120,11 +4321,23 @@ ____wxcore_namelib_DEP = $(__corelib___depname)
 __advdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_208 = D
+__RUNTIME_LIBS_240 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_208 = $(__THREADSFLAG)
+__RUNTIME_LIBS_240 = $(__THREADSFLAG)
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
@@ -4206,11 +4419,23 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 __advlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_247 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_247 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_247 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_247 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_221 = D
+__RUNTIME_LIBS_255 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_221 = $(__THREADSFLAG)
+__RUNTIME_LIBS_255 = $(__THREADSFLAG)
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
@@ -4298,21 +4523,45 @@ ____wxadv_namelib_DEP = $(__advlib___depname)
 __mediadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_235 = D
+__RUNTIME_LIBS_271 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_235 = $(__THREADSFLAG)
+__RUNTIME_LIBS_271 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 __medialib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_278 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_278 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_278 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_278 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_248 = D
+__RUNTIME_LIBS_286 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_248 = $(__THREADSFLAG)
+__RUNTIME_LIBS_286 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxmedia_namedll_DEP = $(__mediadll___depname)
@@ -4324,21 +4573,45 @@ ____wxmedia_namelib_DEP = $(__medialib___depname)
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_262 = D
+__RUNTIME_LIBS_302 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_262 = $(__THREADSFLAG)
+__RUNTIME_LIBS_302 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_309 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_309 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_309 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_309 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_275 = D
+__RUNTIME_LIBS_317 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_275 = $(__THREADSFLAG)
+__RUNTIME_LIBS_317 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxhtml_namedll_DEP = $(__htmldll___depname)
@@ -4350,21 +4623,45 @@ ____wxhtml_namelib_DEP = $(__htmllib___depname)
 __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_289 = D
+__RUNTIME_LIBS_333 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_289 = $(__THREADSFLAG)
+__RUNTIME_LIBS_333 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qalib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_340 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_340 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_340 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_340 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_302 = D
+__RUNTIME_LIBS_348 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_302 = $(__THREADSFLAG)
+__RUNTIME_LIBS_348 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxqa_namedll_DEP = $(__qadll___depname)
@@ -4376,21 +4673,45 @@ ____wxqa_namelib_DEP = $(__qalib___depname)
 __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_316 = D
+__RUNTIME_LIBS_364 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_316 = $(__THREADSFLAG)
+__RUNTIME_LIBS_364 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __xmllib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_371 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_371 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_371 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_371 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_329 = D
+__RUNTIME_LIBS_379 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_329 = $(__THREADSFLAG)
+__RUNTIME_LIBS_379 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxml_namedll_DEP = $(__xmldll___depname)
@@ -4402,21 +4723,45 @@ ____wxxml_namelib_DEP = $(__xmllib___depname)
 __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_343 = D
+__RUNTIME_LIBS_395 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_343 = $(__THREADSFLAG)
+__RUNTIME_LIBS_395 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
 __xrclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_402 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_402 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_402 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_402 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_356 = D
+__RUNTIME_LIBS_410 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_356 = $(__THREADSFLAG)
+__RUNTIME_LIBS_410 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxrc_namedll_DEP = $(__xrcdll___depname)
@@ -4428,21 +4773,45 @@ ____wxxrc_namelib_DEP = $(__xrclib___depname)
 __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_370 = D
+__RUNTIME_LIBS_426 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_370 = $(__THREADSFLAG)
+__RUNTIME_LIBS_426 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
 __auilib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_433 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_433 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_433 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_433 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_383 = D
+__RUNTIME_LIBS_441 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_383 = $(__THREADSFLAG)
+__RUNTIME_LIBS_441 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxaui_namedll_DEP = $(__auidll___depname)
@@ -4454,21 +4823,45 @@ ____wxaui_namelib_DEP = $(__auilib___depname)
 __ribbondll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_457 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_457 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
 __ribbonlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_464 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_464 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_464 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_464 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_410 = D
+__RUNTIME_LIBS_472 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+__RUNTIME_LIBS_472 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxribbon_namedll_DEP = $(__ribbondll___depname)
@@ -4480,21 +4873,45 @@ ____wxribbon_namelib_DEP = $(__ribbonlib___depname)
 __propgriddll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_488 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_488 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
 __propgridlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_495 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_495 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_495 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_495 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_437 = D
+__RUNTIME_LIBS_503 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_437 = $(__THREADSFLAG)
+__RUNTIME_LIBS_503 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
@@ -4506,21 +4923,45 @@ ____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
 __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_451 = D
+__RUNTIME_LIBS_519 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_451 = $(__THREADSFLAG)
+__RUNTIME_LIBS_519 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
 __richtextlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_526 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_526 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_526 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_526 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_464 = D
+__RUNTIME_LIBS_534 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_464 = $(__THREADSFLAG)
+__RUNTIME_LIBS_534 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
@@ -4532,21 +4973,45 @@ ____wxrichtext_namelib_DEP = $(__richtextlib___depname)
 __stcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_478 = D
+__RUNTIME_LIBS_550 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+__RUNTIME_LIBS_550 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
 __stclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_557 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_557 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_557 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_557 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_491 = D
+__RUNTIME_LIBS_565 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_491 = $(__THREADSFLAG)
+__RUNTIME_LIBS_565 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxstc_namedll_DEP = $(__stcdll___depname)
@@ -4558,11 +5023,23 @@ ____wxstc_namelib_DEP = $(__stclib___depname)
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_505 = D
+__RUNTIME_LIBS_581 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_505 = $(__THREADSFLAG)
+__RUNTIME_LIBS_581 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
@@ -4580,11 +5057,23 @@ __WXLIB_MONO_p = \
 __gllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_588 = $(__DEBUGRUNTIME_40)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_588 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_588 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_588 = $(__DEBUGRUNTIME_40)
+!endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_518 = D
+__RUNTIME_LIBS_596 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_518 = $(__THREADSFLAG)
+__RUNTIME_LIBS_596 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxgl_namedll_DEP = $(__gldll___depname)
@@ -4603,28 +5092,28 @@ __htmldll_library_link_LIBR = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_16 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 =
+__DEBUGINFO_16 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_4 =
+__DEBUGINFO_16 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_16 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_4 = /d _DEBUG
+____DEBUGRUNTIME_5 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_4 =
+____DEBUGRUNTIME_5 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_4 =
+____DEBUGRUNTIME_5 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_4 = /d _DEBUG
+____DEBUGRUNTIME_5 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 __NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
@@ -4678,10 +5167,10 @@ __GDIPLUS_LIB_p = gdiplus.lib
 __DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO =
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO =
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO = /Zi
@@ -4690,10 +5179,10 @@ __DEBUGINFO = /Zi
 ____DEBUGRUNTIME = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME =
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME =
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME = /D_DEBUG
@@ -4702,14 +5191,26 @@ ____DEBUGRUNTIME = /D_DEBUG
 __DEBUGRUNTIME = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME =
+__DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME =
+__DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME = d
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_40 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_40 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_40 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_40 = 
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif
@@ -4723,13 +5224,13 @@ __THREADSFLAG = L
 __THREADSFLAG = T
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG =
+__RTTIFLAG = 
 !endif
 !if "$(USE_RTTI)" == "1"
 __RTTIFLAG = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG = /EHsc
@@ -4783,7 +5284,7 @@ $(OBJS):
 
 all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -4932,7 +5433,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
@@ -4947,7 +5448,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
@@ -4966,7 +5467,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 <<
 !endif
@@ -4985,7 +5486,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 <<
 !endif
@@ -5004,7 +5505,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 <<
 !endif
@@ -5023,7 +5524,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 <<
 !endif
@@ -5042,7 +5543,7 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 <<
 !endif
@@ -5061,7 +5562,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 <<
 !endif
@@ -5080,7 +5581,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 <<
 !endif
@@ -5099,7 +5600,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 <<
 !endif
@@ -5118,7 +5619,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 <<
 !endif
@@ -5137,7 +5638,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
 <<
 !endif
@@ -5156,7 +5657,7 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
 <<
 !endif
@@ -5175,7 +5676,7 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 <<
 !endif
@@ -5194,7 +5695,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 <<
 !endif
@@ -5213,7 +5714,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
        $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 <<
 !endif
@@ -5230,12 +5731,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 !endif
 
-sub_samples:
+sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd "$(MAKEDIR)"
 
-$(LIBDIRNAME):
+$(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(SETUPHDIR): $(LIBDIRNAME)
@@ -5244,10 +5745,10 @@ $(SETUPHDIR): $(LIBDIRNAME)
 $(SETUPHDIR)\wx: $(SETUPHDIR)
        if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
 
-..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h:
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: 
        if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
 
-$(SETUPHDIR)\wx\setup.h:
+$(SETUPHDIR)\wx\setup.h: 
        if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
@@ -8088,7 +8589,7 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -10263,7 +10764,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
 
 $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
@@ -10920,7 +11421,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
@@ -11001,7 +11502,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
@@ -13542,7 +14043,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
 
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
@@ -13773,7 +14274,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -13806,7 +14307,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -13959,7 +14460,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
@@ -13980,7 +14481,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
@@ -14001,7 +14502,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
@@ -14376,7 +14877,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@@ -14421,7 +14922,7 @@ $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
 
 $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
@@ -14490,7 +14991,7 @@ $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
 
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -14547,7 +15048,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
@@ -14610,7 +15111,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -14637,7 +15138,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 8cfb89c3e0df9d268f008fae0104aa22c58df28e..03750b36d8f52df0fefaea0019eb8b23cb52e5f0 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -43,7 +43,7 @@ VENDORTAG =
 VENDORTAG = _$(VENDOR)
 !endif
 !ifeq OFFICIAL_BUILD 1
-VENDORTAG =
+VENDORTAG = 
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
@@ -82,10 +82,10 @@ __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 __monodll___depname =
 !ifeq MONOLITHIC 1
@@ -3069,11 +3069,11 @@ __DEBUGINFO_3 = debug all
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO_3 =
+__DEBUGINFO_3 = 
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO_3 =
+__DEBUGINFO_3 = 
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_3 = debug all
@@ -3120,7 +3120,7 @@ __OPTIMIZEFLAG = -ot -ox
 !endif
 __THREADSFLAG =
 !ifeq USE_THREADS 0
-__THREADSFLAG =
+__THREADSFLAG = 
 !endif
 !ifeq USE_THREADS 1
 __THREADSFLAG = -bm
@@ -3130,18 +3130,18 @@ __RUNTIME_LIBS =
 __RUNTIME_LIBS = -br
 !endif
 !ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS =
+__RUNTIME_LIBS = 
 !endif
 __RTTIFLAG =
 !ifeq USE_RTTI 0
-__RTTIFLAG =
+__RTTIFLAG = 
 !endif
 !ifeq USE_RTTI 1
 __RTTIFLAG = -xr
 !endif
 __EXCEPTIONSFLAG =
 !ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG = -xs
@@ -4601,7 +4601,7 @@ $(OBJS) :
 
 all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
-clean : .SYMBOLIC
+clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
@@ -5273,12 +5273,12 @@ wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 !endif
 !endif
 
-samples : .SYMBOLIC
+samples : .SYMBOLIC 
        cd ..\..\samples
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
-$(LIBDIRNAME) :
+$(LIBDIRNAME) :  
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
 $(SETUPHDIR) :  $(LIBDIRNAME)
@@ -5287,10 +5287,10 @@ $(SETUPHDIR) :  $(LIBDIRNAME)
 $(SETUPHDIR)\wx :  $(SETUPHDIR)
        if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
 
-..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h :
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h :  
        if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
 
-$(SETUPHDIR)\wx\setup.h :
+$(SETUPHDIR)\wx\setup.h :  
        if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(SETUPHDIR)\wx\msw :  $(SETUPHDIR)\wx

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 43a721442f69c2cc8593bbc1f10820c491b51914..88d503cbb5dfd9d6cb0e7af027d3b453d0e017da 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -391,10 +391,10 @@ SOURCE=..\..\src\common\fs_mem.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\common\fswatchercmn.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\common\fswatchercmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\hash.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -623,10 +623,10 @@ SOURCE=..\..\src\msw\evtloop.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\fswatcher.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\msw\fswatcher.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\msw\main.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -717,14 +717,14 @@ SOURCE=..\..\src\msw\version.rc
 SOURCE=..\..\src\msw\volume.cpp\r
 # End Source File\r
 # End Group\r
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\generic\fswatcherg.cpp
-# End Source File
-# End Group
+# Begin Group "Generic Sources"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\fswatcherg.cpp\r
+# End Source File\r
+# End Group\r
 # Begin Group "Setup Headers"\r
 \r
 # PROP Default_Filter ""\r
@@ -900,10 +900,10 @@ SOURCE=..\..\include\wx\msw\debughlp.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\fswatcher.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\fswatcher.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\gccpriv.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1046,14 +1046,14 @@ SOURCE=..\..\include\wx\msw\wrapcdlg.h
 SOURCE=..\..\include\wx\msw\wrapwin.h\r
 # End Source File\r
 # End Group\r
-# Begin Group "Generic Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\fswatcher.h
-# End Source File
-# End Group
+# Begin Group "Generic Headers"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\fswatcher.h\r
+# End Source File\r
+# End Group\r
 # Begin Group "wxHTML Headers"\r
 \r
 # PROP Default_Filter ""\r
@@ -1279,10 +1279,10 @@ SOURCE=..\..\include\wx\fs_zip.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\fswatcher.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\fswatcher.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\hash.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index d54fcec9292cb548b8bd513cbabd8b8d4d7f896f..edff22967e5d57da71e1e67dcdfeaffa6a3ab823 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5947,6 +5947,10 @@ SOURCE=..\..\include\wx\evtloop.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\evtloopsrc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\fdrepdlg.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 6efa6bf4689ec9740805de7e3a80c26b705add74..bd5ca939d198b020a45aa4a8aee0a1923a6eade5 100644 (file)
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
index 7dbecd4b6c97f703b20b0b2c063f175b783cfbb9..3b3d3d4420a69217d48dd5d56af53b781afd2934 100644 (file)
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 1232edd119c1050202541e6209c52929b1d5da0a..b440ec6877d1a779c8cc701ec584126d464e40d6 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -733,9 +733,9 @@
                                RelativePath="..\..\src\common\fs_mem.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\fswatchercmn.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\fswatchercmn.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\hash.cpp">\r
                        </File>\r
                        <File\r
@@ -908,9 +908,9 @@
                                RelativePath="..\..\src\msw\evtloop.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\fswatcher.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\msw\fswatcher.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\msw\main.cpp">\r
                        </File>\r
                        <File\r
@@ -969,13 +969,13 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Sources"
-                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
-                       <File
-                               RelativePath="..\..\src\generic\fswatcherg.cpp">
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fswatcherg.cpp">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="Setup Headers"\r
                        UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">\r
                        <File\r
@@ -1095,9 +1095,9 @@
                                RelativePath="..\..\include\wx\msw\debughlp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\fswatcher.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\fswatcher.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\gccpriv.h">\r
                        </File>\r
                        <File\r
@@ -1216,13 +1216,13 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Headers"
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
-                       <File
-                               RelativePath="..\..\include\wx\generic\fswatcher.h">
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\fswatcher.h">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                        <File\r
@@ -1392,9 +1392,9 @@
                                RelativePath="..\..\include\wx\fs_zip.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\fswatcher.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\fswatcher.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\hash.h">\r
                        </File>\r
                        <File\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 513b97051bf2a0a37172877a408e7f53a621d77a..443eedcf0d20f660a7fbd28f12a13e79a6f79ee4 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -5077,6 +5077,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\evtloop.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\fdrepdlg.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
index 39d23821aa840bb2b1ae91ff03ce41921b63b9a5..82553a146b577b9cf44fdc0890dfdfa672e3a328 100644 (file)
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj
index 06179183400056f5cddf5cab1ed6312a1a052fdd..e86c9a5f09d65f00fde1ab2c895b2ee2b26c353a 100644 (file)
--- a/build/msw/wx_vc7_html.vcproj
+++ b/build/msw/wx_vc7_html.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj
index 01fb50fb95d88e58ad53b829fd2c921b8ca0b8f3..7f8f2192a45f24aa1f3f51f0423a53d5390c27a7 100644 (file)
--- a/build/msw/wx_vc7_media.vcproj
+++ b/build/msw/wx_vc7_media.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index e04e6fb9bb35e08db5bc59eed7677935d78e3ab0..7344f9435eee716d36fd3bc08481c60d68be6d0f 100644 (file)
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj
index c828d9052d0487ffa46634eec4f6c82839ab8649..8fe081899756e268a7add57143d8ac1a42a0b298 100644 (file)
--- a/build/msw/wx_vc7_propgrid.vcproj
+++ b/build/msw/wx_vc7_propgrid.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj
index 37715c4903dc19cc70b5ba2ec603c7a7054adf40..03185c03b41460551e2d2723cec6dca6be08d798 100644 (file)
--- a/build/msw/wx_vc7_qa.vcproj
+++ b/build/msw/wx_vc7_qa.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj
index f99106cbc541714a2207de8ad37dc502df5781ce..5e57b4dd5c203df343d97b25dc58fdc86c1331db 100644 (file)
--- a/build/msw/wx_vc7_ribbon.vcproj
+++ b/build/msw/wx_vc7_ribbon.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
index 0eaf6101758f67adef2c24ccb56ff0962aec5d94..a751187e457e42c7f45a53066dfcd5ad097c3127 100644 (file)
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj
index 9fd646d6004c3a00c649c3588ad8561384524ff4..576cab235ff2ce9ed3010977ca8219395ea233c9 100644 (file)
--- a/build/msw/wx_vc7_stc.vcproj
+++ b/build/msw/wx_vc7_stc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj
index 525725b7970a0e38a18ddd22f9e556359fe88d9d..a6f46cfb7f263dc52b2f818deacbfc01d0e93724 100644 (file)
--- a/build/msw/wx_vc7_wxexpat.vcproj
+++ b/build/msw/wx_vc7_wxexpat.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj
index 7744c107c55ca97d5a1ff246f98827dc27e25bf4..f38b24a587e81c200af54bd466f106ad4c18d193 100644 (file)
--- a/build/msw/wx_vc7_wxjpeg.vcproj
+++ b/build/msw/wx_vc7_wxjpeg.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxpng.vcproj b/build/msw/wx_vc7_wxpng.vcproj
index 515227a5d280d9cb356b8a64f4dc7ee8043f9cbe..530a69115e8ff1db18c756dccc5589b6dad44c37 100644 (file)
--- a/build/msw/wx_vc7_wxpng.vcproj
+++ b/build/msw/wx_vc7_wxpng.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxregex.vcproj b/build/msw/wx_vc7_wxregex.vcproj
index cdd53338c0ca3ef261f8e96800da827baa324d02..9ef5960961fa3dc64a30a377700ce9644548b986 100644 (file)
--- a/build/msw/wx_vc7_wxregex.vcproj
+++ b/build/msw/wx_vc7_wxregex.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -28,7 +28,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -49,7 +49,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -59,7 +59,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
@@ -85,7 +85,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -103,7 +103,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -113,7 +113,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
@@ -139,7 +139,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -160,7 +160,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -170,7 +170,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
@@ -196,7 +196,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -214,7 +214,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -224,7 +224,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
@@ -250,7 +250,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -271,7 +271,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -281,7 +281,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
@@ -307,7 +307,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -325,7 +325,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -335,7 +335,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
@@ -361,7 +361,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -382,7 +382,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -392,7 +392,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
@@ -418,7 +418,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -436,7 +436,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -446,7 +446,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 484bd338e2e22ab8d1329ea21727b0bcfc09a6bd..ae936c73716c89076a090e0f8dfd8c6b0c940e18 100644 (file)
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 5874ffc4c0237262204d8b7d06d91d0153cffbe5..c7d12619b7fe6421aaa434e49b395c8c0ef6fe25 100644 (file)
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_wxzlib.vcproj b/build/msw/wx_vc7_wxzlib.vcproj
index bc6605ed78f6f30a484b5c8dea1c475cffa67dcc..41171af80319e5ee9aecff8a9945d17b529443d7 100644 (file)
--- a/build/msw/wx_vc7_wxzlib.vcproj
+++ b/build/msw/wx_vc7_wxzlib.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r

diff --git a/build/msw/wx_vc7_xml.vcproj b/build/msw/wx_vc7_xml.vcproj
index 7fbbe47bfc45e01fa3e95d43c78ec4d46d2529ed..2b0e4e4ccb6071526eaf52a1858acc36a6d41af5 100644 (file)
--- a/build/msw/wx_vc7_xml.vcproj
+++ b/build/msw/wx_vc7_xml.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index cb28dd92b11fe32129e7e0e8d468ef09997e8d28..24504ea6d40aba6a884ead7d2f8528b875fad556 100644 (file)
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 24d7979e8044a5bf45d1e48d35c220bd218c4983..dadef4989304f17dd1458349294770b1ccaac957 100644 (file)
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index e10b6e52ee4f24abf9e38812b5c6434cc11bb839..6d60e647bb9fa8aabc9601d4ce35459f65260b1b 100644 (file)
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index eac5aa5aadb3ba3c8055935e98292acf1eeda06b..ffb8e90cd03620617bfc2dedbf1d7b546fbc9f7f 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -1011,10 +1011,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\fswatchercmn.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\fswatchercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\hash.cpp"\r
                                >\r
                        </File>\r
@@ -1244,10 +1244,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\fswatcher.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\msw\fswatcher.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r
                                >\r
                        </File>\r
@@ -1325,15 +1325,15 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Sources"
-                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
-                       >
-                       <File
-                               RelativePath="..\..\src\generic\fswatcherg.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fswatcherg.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="Setup Headers"\r
                        UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"\r
                        >\r
@@ -1487,10 +1487,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\fswatcher.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\fswatcher.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\gccpriv.h"\r
                                >\r
                        </File>\r
@@ -1640,15 +1640,15 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Headers"
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
-                       >
-                       <File
-                               RelativePath="..\..\include\wx\generic\fswatcher.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\fswatcher.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"\r
                        >\r
@@ -1874,10 +1874,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\fswatcher.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\fswatcher.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\hash.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index a408b8b347db10e436e7ffa317e60e71e0ecabe8..d7158719189d153dd5ce8c5c5d378cd87bc56903 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -6787,6 +6787,10 @@
                                RelativePath="..\..\include\wx\evtloop.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\fdrepdlg.h"\r
                                >\r

diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
index fb7e457e30e1b46ffe195b3b4f5577a305fb88d9..b73e071ce325300e998993c0c645af980f31654a 100644 (file)
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index 4e0aa60dac1476b4369113b64d520dcc968e7d07..54736ecf79ecd97e44d4b8ee2c95380723ce58ad 100644 (file)
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj
index d908905ed1bd1865ad171c40351e32ecc2d8fe43..e33a72d61d70adbe07ead1224beeaa76939d317e 100644 (file)
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index 7f7d4bb6f2d96d013468f481ae4ce4f19c9e4c7e..93ef8106fe34a0696bcb80f400785e518aa6b178 100644 (file)
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj
index 194155ecbbb46ffb646bd0489c44c01b54febf30..5daaff193c972116af46718a7ee5515832fd1d65 100644 (file)
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
index 2bb3c1f9d69819a1b231c88c5cf0e3f637759400..4b03f7e8a6c466e97188821aa081ed301f6a91b5 100644 (file)
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj
index 9dcdc2433d44ab6ce6f6a8d9a9b269eb9fd42e68..0de6955155b49528173e55cd15d7c966a553ab22 100644 (file)
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
index f2ba5065468d4db6202e1c542d57eae53521bf16..a34707120d9928e9fa86b65dd11b1118adea1226 100644 (file)
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index 72fa76e8376d97ab4da44b5a3ed442a63e537c3e..066f624c65d47ebf8263b3c08b52d3e05e3252db 100644 (file)
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj
index 8c69d8c2fb9a52b8a63b25f789d5b0d48e57b1ef..5c198827d3ea02339b12983987dd6148ed2b8476 100644 (file)
--- a/build/msw/wx_vc8_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj
index e52b1e1298fd320d8c89d129bcd69d8956cb33cf..3492b5d8c35a61ca2a8882dadb8aaf289cc2228d 100644 (file)
--- a/build/msw/wx_vc8_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj
index 35d94ca446a3eafaf738e6e93254c1154119c9fa..c9edca35a4532836b29b3322da9dc0185fdb1757 100644 (file)
--- a/build/msw/wx_vc8_wxpng.vcproj
+++ b/build/msw/wx_vc8_wxpng.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj
index b7848b78cd36c7cafda88e202ecf593ece9a14b5..9a31fefac9b211c8b15e1580e3f79d3746a0b1f7 100644 (file)
--- a/build/msw/wx_vc8_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -44,14 +44,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -70,7 +70,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                        />\r
@@ -126,14 +126,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -149,7 +149,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                        />\r
@@ -205,14 +205,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -231,7 +231,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                        />\r
@@ -287,14 +287,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -310,7 +310,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                        />\r
@@ -366,14 +366,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -392,7 +392,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                        />\r
@@ -448,14 +448,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -471,7 +471,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                        />\r
@@ -527,14 +527,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -553,7 +553,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                        />\r
@@ -609,14 +609,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -632,7 +632,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
index e1c990bee44664cfe3f496358218f6043c524676..d5bfac5b90b9ba99ecf5c6502686048e1659db91 100644 (file)
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
index 90e5552a3be010c5d77ec7676967c830c3ba891b..18ba622e6cd3708703c88c8d820852be2f2ad358 100644 (file)
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r

diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj
index b84c4abcde08d0e846b49a259c8432f65760fb3a..1e5bcd5c31c09e50d247d79fd1c016c47f83b996 100644 (file)
--- a/build/msw/wx_vc8_wxzlib.vcproj
+++ b/build/msw/wx_vc8_wxzlib.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,14 +43,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -124,14 +124,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -202,14 +202,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -283,14 +283,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -361,14 +361,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -442,14 +442,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -520,14 +520,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
@@ -601,14 +601,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""\r
                        />\r

diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
index 04cc1b42e155cc1b3520f93381cc3559f63d2488..c45e1f6287c2df1be14d2feadbb58f8acafcd577 100644 (file)
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 27bdf9deff41c8b7e32e29ebbda8255ddec4ad6a..797da872ce4b80a281adb785d649fd5933f88ed5 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index db8f487f8399f081459db8cc33149d335dff4d99..907e297d42faf73cd80cd1681e08111cc858cd84 100644 (file)
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj
index 7f8bb34fe31001464fbdfd4565bf436412cf7acb..23eaaeb6eedcf13ea3e0db99b56765a5c01af7e8 100644 (file)
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 4ad7c3ee18e372ad1997ed4414202b771863daee..edb1993292de89af34e651a48530cc0e0a639a10 100644 (file)
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -1007,10 +1007,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\fswatchercmn.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\fswatchercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\hash.cpp"\r
                                >\r
                        </File>\r
@@ -1240,10 +1240,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\fswatcher.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\msw\fswatcher.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r
                                >\r
                        </File>\r
@@ -1321,15 +1321,15 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Sources"
-                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
-                       >
-                       <File
-                               RelativePath="..\..\src\generic\fswatcherg.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fswatcherg.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="Setup Headers"\r
                        UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"\r
                        >\r
@@ -1483,10 +1483,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\fswatcher.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\fswatcher.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\gccpriv.h"\r
                                >\r
                        </File>\r
@@ -1636,15 +1636,15 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Generic Headers"
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
-                       >
-                       <File
-                               RelativePath="..\..\include\wx\generic\fswatcher.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\fswatcher.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"\r
                        >\r
@@ -1870,10 +1870,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\fswatcher.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\fswatcher.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\hash.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 0ecb9c7253a39057def4ea35612ac4dd0630ee76..c0f2b84b69d83c802a1d9495eb000f948a695fd8 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -6783,6 +6783,10 @@
                                RelativePath="..\..\include\wx\evtloop.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\fdrepdlg.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj
index df5870a6b9ffd32c58c7ab7d87e777b047d95cca..cfc5154349874a59f92186fde0eca4224f2e3ece 100644 (file)
--- a/build/msw/wx_vc9_gl.vcproj
+++ b/build/msw/wx_vc9_gl.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj
index 9c2911553c1523f99fcdfce4c24cb12df54ad6c4..9607c188fe064d830a80a6f1ed0dadca2c4ee771 100644 (file)
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj
index 750615ce3ee803e7186f7ab2fd359fc62e1f7a97..1f4f029ae31011ce9943392bdf610fd9c718dfab 100644 (file)
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index f6e37bc9845b08899d0cb36baa4b5eddc52d7219..dbd295a123c71b440cd545cc84cafd18888953f3 100644 (file)
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj
index a7b8dddca5c2b5b36955883529e04fd9d75a01e9..bd558698660c2ff433d44a2942f83da6893541ce 100644 (file)
--- a/build/msw/wx_vc9_propgrid.vcproj
+++ b/build/msw/wx_vc9_propgrid.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj
index 4e91e49f8dd3a73ee4f2eab759a67547b4b57962..f7aba8393235b4ccc1048afbe8ccfc07e1939c24 100644 (file)
--- a/build/msw/wx_vc9_qa.vcproj
+++ b/build/msw/wx_vc9_qa.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj
index d7e4ad08297fdb3435713d127035cd75b93a8f0d..355910d99eb4935d9978afbb81e9b9711b5d74c3 100644 (file)
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj
index 16a58bdf97e4efe4d260580a83f972b7b45c4b47..56ecbd2210e4dbd457756d8263ff1ac0591f3c64 100644 (file)
--- a/build/msw/wx_vc9_richtext.vcproj
+++ b/build/msw/wx_vc9_richtext.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj
index 026ba68a14bb01a562041b2e0745f483c02038d8..915f87e2e3911f4be3e8d2454a11b78209dee428 100644 (file)
--- a/build/msw/wx_vc9_stc.vcproj
+++ b/build/msw/wx_vc9_stc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj
index cd8a1ba930b45a16f9e374b61a0ba2438dfec9db..854aa5ad595b2352114d2d7010209eeba9525457 100644 (file)
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj
index 678b8ff2d718f66ae0319767e54c45adb9f2e7cc..102a99ce4e64e2ac4444c7909c5e2f107a3d2dc9 100644 (file)
--- a/build/msw/wx_vc9_wxjpeg.vcproj
+++ b/build/msw/wx_vc9_wxjpeg.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj
index dbc0dec458aac53697af97b394dbbc2f0819c91f..5b07f9e61119daba317e28bb5a2f7e53c612c753 100644 (file)
--- a/build/msw/wx_vc9_wxpng.vcproj
+++ b/build/msw/wx_vc9_wxpng.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj
index 750d13d278896506704516a0ba77f2d35132eb25..d120cbeba6a716e451c7d9fc523e0f3cf18c3165 100644 (file)
--- a/build/msw/wx_vc9_wxregex.vcproj
+++ b/build/msw/wx_vc9_wxregex.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj
index 9ce2d4412491b89edd8a6b983187eb8b5ed6b9e5..e4281b0f9c76f3a18a63b855df6d2e4475423e96 100644 (file)
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj
index 7bb22b64f1f9df794488f312eef92a3548632a1b..66d01f45c7d65abfa01162c1702ff9e1139ac7cc 100644 (file)
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj
index 7627d469274e3fd4a34b6c1b2a3b69be4ed5a89d..0124a7a8fe28af8756a4ef124c71ce0a20467c67 100644 (file)
--- a/build/msw/wx_vc9_wxzlib.vcproj
+++ b/build/msw/wx_vc9_wxzlib.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj
index 33836035bde044dead1eb2cc1ba51e1be9e5ca4a..632d79d842e7f8aae58b81d1b149c411342286ae 100644 (file)
--- a/build/msw/wx_vc9_xml.vcproj
+++ b/build/msw/wx_vc9_xml.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index ffb1243fe0d3d62cb814747dfbcff4ce191cdaab..5a64883147979c25096d5b7af6e029dfab833b36 100644 (file)
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r

diff --git a/configure b/configure
index d35cf492f3d63c400cbd21a2c5f650a44057c1d9..0b3295c994a3a790879add44a6bed5300e6b8f3e 100755 (executable)
--- a/configure
+++ b/configure
@@ -48868,7 +48868,7 @@ EOF
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
 
 
                                 { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
@@ -49975,10 +49975,10 @@ fi
 
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.7"
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.7"
 
 
 

diff --git a/demos/Makefile.in b/demos/Makefile.in
index 605ee0f588053129567e1899cdd69d84b52f56bc..2de247934bdd6c710b505fd2b1431547859abe59 100644 (file)
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 039a5403efca6d0fdd80bd378b8fc426fe12956a..6acad57570344637ac2980aa11ab7b9d000adac0 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/bombs/bombs.dsp b/demos/bombs/bombs.dsp
index 275553b1c2cfc219e100642c02dee82814619518..38afe33a5d463282831e3705fae73e47fe360c07 100644 (file)
--- a/demos/bombs/bombs.dsp
+++ b/demos/bombs/bombs.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\bombs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\bombs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\bombs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\bombs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj
index bb26155ce8ee574f3be197a3e05ba227959bc975..6c8f0c5dcecaf918dd04ff699343b78c9cb5afb5 100644 (file)
--- a/demos/bombs/bombs_vc7.vcproj
+++ b/demos/bombs/bombs_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/demos/bombs/bombs_vc8.vcproj b/demos/bombs/bombs_vc8.vcproj
index 597aa6ce220d808b9442484552d79bda49df9b57..155435e14f273e45ab28ae90722337c9cdd86ff6 100644 (file)
--- a/demos/bombs/bombs_vc8.vcproj
+++ b/demos/bombs/bombs_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/bombs/bombs_vc9.vcproj b/demos/bombs/bombs_vc9.vcproj
index c18a0b7dfa9e3e7d4460eb6f3d335ff4634f5854..6a5dd38dc6bf715bdb0ef0e7d405226fe7fce86e 100644 (file)
--- a/demos/bombs/bombs_vc9.vcproj
+++ b/demos/bombs/bombs_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bombs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\bombs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc
index 0b4a8364577f254460a2ad1463c3eafe47ce6cf0..152000dda9f16580094fbdc4972d3473fb9dc6dd 100644 (file)
--- a/demos/bombs/makefile.bcc
+++ b/demos/bombs/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BOMBS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-BOMBS_OBJECTS =  \\r
-       $(OBJS)\bombs_bombs.obj \\r
-       $(OBJS)\bombs_bombs1.obj \\r
-       $(OBJS)\bombs_game.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bombs.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe\r
-       -if exist $(OBJS)\bombs.tds del $(OBJS)\bombs.tds\r
-       -if exist $(OBJS)\bombs.ilc del $(OBJS)\bombs.ilc\r
-       -if exist $(OBJS)\bombs.ild del $(OBJS)\bombs.ild\r
-       -if exist $(OBJS)\bombs.ilf del $(OBJS)\bombs.ilf\r
-       -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils\r
-\r
-$(OBJS)\bombs.exe: $(BOMBS_OBJECTS)  $(OBJS)\bombs_bombs.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res\r
-|\r
-\r
-$(OBJS)\bombs_bombs.obj: .\bombs.cpp\r
-       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\bombs.cpp\r
-\r
-$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp\r
-       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp\r
-\r
-$(OBJS)\bombs_game.obj: .\game.cpp\r
-       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\bombs_bombs.res: .\bombs.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\bombs.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BOMBS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+BOMBS_OBJECTS =  \
+       $(OBJS)\bombs_bombs.obj \
+       $(OBJS)\bombs_bombs1.obj \
+       $(OBJS)\bombs_game.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bombs.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
+       -if exist $(OBJS)\bombs.tds del $(OBJS)\bombs.tds
+       -if exist $(OBJS)\bombs.ilc del $(OBJS)\bombs.ilc
+       -if exist $(OBJS)\bombs.ild del $(OBJS)\bombs.ild
+       -if exist $(OBJS)\bombs.ilf del $(OBJS)\bombs.ilf
+       -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils
+
+$(OBJS)\bombs.exe: $(BOMBS_OBJECTS)  $(OBJS)\bombs_bombs.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
+|
+
+$(OBJS)\bombs_bombs.obj: .\bombs.cpp
+       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\bombs.cpp
+
+$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp
+       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp
+
+$(OBJS)\bombs_game.obj: .\game.cpp
+       $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\game.cpp
+
+$(OBJS)\bombs_bombs.res: .\bombs.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\bombs.rc
+

diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc
index d8bf336cca2a3a5c00dd31a2143249529234ddd5..cacc6501c5ea83eff7a301079eb48e6b74a53958 100644 (file)
--- a/demos/bombs/makefile.gcc
+++ b/demos/bombs/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BOMBS_OBJECTS =  \\r
-       $(OBJS)\bombs_bombs.o \\r
-       $(OBJS)\bombs_bombs1.o \\r
-       $(OBJS)\bombs_game.o \\r
-       $(OBJS)\bombs_bombs_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bombs.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe\r
-\r
-$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o\r
-       $(CXX) -o $@ $(BOMBS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\bombs_bombs.o: ./bombs.cpp\r
-       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bombs_bombs1.o: ./bombs1.cpp\r
-       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bombs_game.o: ./game.cpp\r
-       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bombs_bombs_rc.o: ./bombs.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BOMBS_OBJECTS =  \
+       $(OBJS)\bombs_bombs.o \
+       $(OBJS)\bombs_bombs1.o \
+       $(OBJS)\bombs_game.o \
+       $(OBJS)\bombs_bombs_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bombs.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
+
+$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
+       $(CXX) -o $@ $(BOMBS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\bombs_bombs.o: ./bombs.cpp
+       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bombs_bombs1.o: ./bombs1.cpp
+       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bombs_game.o: ./game.cpp
+       $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bombs_bombs_rc.o: ./bombs.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc
index be6624e216fdbcb98795e3f31d610d3f997b9a29..518c10426b1864e110cc3c6245c24ba0bf817d2a 100644 (file)
--- a/demos/bombs/makefile.vc
+++ b/demos/bombs/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-BOMBS_OBJECTS =  \\r
-       $(OBJS)\bombs_bombs.obj \\r
-       $(OBJS)\bombs_bombs1.obj \\r
-       $(OBJS)\bombs_game.obj \\r
-       $(OBJS)\bombs_bombs.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bombs.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe\r
-       -if exist $(OBJS)\bombs.ilk del $(OBJS)\bombs.ilk\r
-       -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb\r
-\r
-$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(BOMBS_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\bombs_bombs.obj: .\bombs.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs.cpp\r
-\r
-$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp\r
-\r
-$(OBJS)\bombs_game.obj: .\game.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\bombs_bombs.res: .\bombs.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+BOMBS_OBJECTS =  \
+       $(OBJS)\bombs_bombs.obj \
+       $(OBJS)\bombs_bombs1.obj \
+       $(OBJS)\bombs_game.obj
+BOMBS_RESOURCES =  \
+       $(OBJS)\bombs_bombs.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bombs.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
+       -if exist $(OBJS)\bombs.ilk del $(OBJS)\bombs.ilk
+       -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb
+
+$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(BOMBS_OBJECTS) $(BOMBS_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\bombs_bombs.obj: .\bombs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs.cpp
+
+$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp
+
+$(OBJS)\bombs_game.obj: .\game.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp
+
+$(OBJS)\bombs_bombs.res: .\bombs.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc
+

diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat
index 0aa4b1dd2ea748786a4a9186617013ef504980f3..d2b158217a74d5d710eeb97353b918def732a75e 100644 (file)
--- a/demos/bombs/makefile.wat
+++ b/demos/bombs/makefile.wat
@@ -1,268 +1,268 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-BOMBS_OBJECTS =  &\r
-       $(OBJS)\bombs_bombs.obj &\r
-       $(OBJS)\bombs_bombs1.obj &\r
-       $(OBJS)\bombs_game.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\bombs.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe\r
-\r
-$(OBJS)\bombs.exe :  $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res\r
-       @%create $(OBJS)\bombs.lbc\r
-       @%append $(OBJS)\bombs.lbc option quiet\r
-       @%append $(OBJS)\bombs.lbc name $^@\r
-       @%append $(OBJS)\bombs.lbc option caseexact\r
-       @%append $(OBJS)\bombs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %i\r
-       @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res\r
-       @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i\r
-       wlink @$(OBJS)\bombs.lbc\r
-\r
-$(OBJS)\bombs_bombs.obj :  .AUTODEPEND .\bombs.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<\r
-\r
-$(OBJS)\bombs_bombs1.obj :  .AUTODEPEND .\bombs1.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<\r
-\r
-$(OBJS)\bombs_game.obj :  .AUTODEPEND .\game.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<\r
-\r
-$(OBJS)\bombs_bombs.res :  .AUTODEPEND .\bombs.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+BOMBS_OBJECTS =  &
+       $(OBJS)\bombs_bombs.obj &
+       $(OBJS)\bombs_bombs1.obj &
+       $(OBJS)\bombs_game.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\bombs.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
+
+$(OBJS)\bombs.exe :  $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
+       @%create $(OBJS)\bombs.lbc
+       @%append $(OBJS)\bombs.lbc option quiet
+       @%append $(OBJS)\bombs.lbc name $^@
+       @%append $(OBJS)\bombs.lbc option caseexact
+       @%append $(OBJS)\bombs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %i
+       @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res
+       @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i
+       wlink @$(OBJS)\bombs.lbc
+
+$(OBJS)\bombs_bombs.obj :  .AUTODEPEND .\bombs.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
+
+$(OBJS)\bombs_bombs1.obj :  .AUTODEPEND .\bombs1.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
+
+$(OBJS)\bombs_game.obj :  .AUTODEPEND .\game.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
+
+$(OBJS)\bombs_bombs.res :  .AUTODEPEND .\bombs.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 7d57c31878e8169b59573c24a1f37ff4e45528fc..fb7c708db0dc48dd5f3eb75225396d1dc11229a6 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/forty/forty.dsp b/demos/forty/forty.dsp
index c577572ffcafe8aa6cad8806f37d13173c849c10..0ecb770d31480ef0703777ca57e371f66d65156c 100644 (file)
--- a/demos/forty/forty.dsp
+++ b/demos/forty/forty.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\forty"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\forty"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\forty"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\forty"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj
index 9e3e99779e989f1df09f565e8e615c5ab099c043..7db19898915698791dca4d7211d2d0462fe11c47 100644 (file)
--- a/demos/forty/forty_vc7.vcproj
+++ b/demos/forty/forty_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\forty.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/demos/forty/forty_vc8.vcproj b/demos/forty/forty_vc8.vcproj
index 0c3c7b1958dc58d0367104daca32cd8d8b02b415..fb1903dbd6dfdaea380105fb482f2c9e7bb0c9b0 100644 (file)
--- a/demos/forty/forty_vc8.vcproj
+++ b/demos/forty/forty_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/forty/forty_vc9.vcproj b/demos/forty/forty_vc9.vcproj
index 4bad616191fc75a61ef80f6cbb06d01067c3075a..e0011eb49fa249aa91e0fbe2b6869a95b2c922f0 100644 (file)
--- a/demos/forty/forty_vc9.vcproj
+++ b/demos/forty/forty_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\forty.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\forty.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc
index 1ff8fc872140d30a102b6da3f03c259671b307f5..a6ee8f325fbd9dada8604bb4d93c5ed6914286e4 100644 (file)
--- a/demos/forty/makefile.bcc
+++ b/demos/forty/makefile.bcc
@@ -1,276 +1,276 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FORTY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-FORTY_OBJECTS =  \\r
-       $(OBJS)\forty_forty.obj \\r
-       $(OBJS)\forty_canvas.obj \\r
-       $(OBJS)\forty_card.obj \\r
-       $(OBJS)\forty_game.obj \\r
-       $(OBJS)\forty_pile.obj \\r
-       $(OBJS)\forty_playerdg.obj \\r
-       $(OBJS)\forty_scoredg.obj \\r
-       $(OBJS)\forty_scorefil.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\forty.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe\r
-       -if exist $(OBJS)\forty.tds del $(OBJS)\forty.tds\r
-       -if exist $(OBJS)\forty.ilc del $(OBJS)\forty.ilc\r
-       -if exist $(OBJS)\forty.ild del $(OBJS)\forty.ild\r
-       -if exist $(OBJS)\forty.ilf del $(OBJS)\forty.ilf\r
-       -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils\r
-\r
-$(OBJS)\forty.exe: $(FORTY_OBJECTS)  $(OBJS)\forty_forty.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\forty_forty.obj: .\forty.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\forty.cpp\r
-\r
-$(OBJS)\forty_canvas.obj: .\canvas.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\canvas.cpp\r
-\r
-$(OBJS)\forty_card.obj: .\card.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\card.cpp\r
-\r
-$(OBJS)\forty_game.obj: .\game.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\forty_pile.obj: .\pile.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\pile.cpp\r
-\r
-$(OBJS)\forty_playerdg.obj: .\playerdg.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\playerdg.cpp\r
-\r
-$(OBJS)\forty_scoredg.obj: .\scoredg.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scoredg.cpp\r
-\r
-$(OBJS)\forty_scorefil.obj: .\scorefil.cpp\r
-       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scorefil.cpp\r
-\r
-$(OBJS)\forty_forty.res: .\forty.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\forty.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FORTY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+FORTY_OBJECTS =  \
+       $(OBJS)\forty_forty.obj \
+       $(OBJS)\forty_canvas.obj \
+       $(OBJS)\forty_card.obj \
+       $(OBJS)\forty_game.obj \
+       $(OBJS)\forty_pile.obj \
+       $(OBJS)\forty_playerdg.obj \
+       $(OBJS)\forty_scoredg.obj \
+       $(OBJS)\forty_scorefil.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\forty.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
+       -if exist $(OBJS)\forty.tds del $(OBJS)\forty.tds
+       -if exist $(OBJS)\forty.ilc del $(OBJS)\forty.ilc
+       -if exist $(OBJS)\forty.ild del $(OBJS)\forty.ild
+       -if exist $(OBJS)\forty.ilf del $(OBJS)\forty.ilf
+       -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils
+
+$(OBJS)\forty.exe: $(FORTY_OBJECTS)  $(OBJS)\forty_forty.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\forty_forty.obj: .\forty.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\forty.cpp
+
+$(OBJS)\forty_canvas.obj: .\canvas.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\canvas.cpp
+
+$(OBJS)\forty_card.obj: .\card.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\card.cpp
+
+$(OBJS)\forty_game.obj: .\game.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\game.cpp
+
+$(OBJS)\forty_pile.obj: .\pile.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\pile.cpp
+
+$(OBJS)\forty_playerdg.obj: .\playerdg.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\playerdg.cpp
+
+$(OBJS)\forty_scoredg.obj: .\scoredg.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scoredg.cpp
+
+$(OBJS)\forty_scorefil.obj: .\scorefil.cpp
+       $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scorefil.cpp
+
+$(OBJS)\forty_forty.res: .\forty.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\forty.rc
+

diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc
index 6c96297a4e0fe25b29e734051d74b4a84dedfd17..204b3e9b57b78ffdd384af720673f88f9382b866 100644 (file)
--- a/demos/forty/makefile.gcc
+++ b/demos/forty/makefile.gcc
@@ -1,270 +1,270 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FORTY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-FORTY_OBJECTS =  \\r
-       $(OBJS)\forty_forty.o \\r
-       $(OBJS)\forty_canvas.o \\r
-       $(OBJS)\forty_card.o \\r
-       $(OBJS)\forty_game.o \\r
-       $(OBJS)\forty_pile.o \\r
-       $(OBJS)\forty_playerdg.o \\r
-       $(OBJS)\forty_scoredg.o \\r
-       $(OBJS)\forty_scorefil.o \\r
-       $(OBJS)\forty_forty_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\forty.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe\r
-\r
-$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o\r
-       $(CXX) -o $@ $(FORTY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (about.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\forty_forty.o: ./forty.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_canvas.o: ./canvas.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_card.o: ./card.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_game.o: ./game.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_pile.o: ./pile.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_playerdg.o: ./playerdg.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_scoredg.o: ./scoredg.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_scorefil.o: ./scorefil.cpp\r
-       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\forty_forty_rc.o: ./forty.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FORTY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+FORTY_OBJECTS =  \
+       $(OBJS)\forty_forty.o \
+       $(OBJS)\forty_canvas.o \
+       $(OBJS)\forty_card.o \
+       $(OBJS)\forty_game.o \
+       $(OBJS)\forty_pile.o \
+       $(OBJS)\forty_playerdg.o \
+       $(OBJS)\forty_scoredg.o \
+       $(OBJS)\forty_scorefil.o \
+       $(OBJS)\forty_forty_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\forty.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
+
+$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
+       $(CXX) -o $@ $(FORTY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (about.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\forty_forty.o: ./forty.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_canvas.o: ./canvas.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_card.o: ./card.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_game.o: ./game.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_pile.o: ./pile.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_playerdg.o: ./playerdg.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_scoredg.o: ./scoredg.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_scorefil.o: ./scorefil.cpp
+       $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\forty_forty_rc.o: ./forty.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc
index 2387f181394513fe3fe2595b8a718728486d923b..6d8bdf7b0c40b97b22f60b58848eac7478713528 100644 (file)
--- a/demos/forty/makefile.vc
+++ b/demos/forty/makefile.vc
@@ -1,355 +1,380 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-FORTY_OBJECTS =  \\r
-       $(OBJS)\forty_forty.obj \\r
-       $(OBJS)\forty_canvas.obj \\r
-       $(OBJS)\forty_card.obj \\r
-       $(OBJS)\forty_game.obj \\r
-       $(OBJS)\forty_pile.obj \\r
-       $(OBJS)\forty_playerdg.obj \\r
-       $(OBJS)\forty_scoredg.obj \\r
-       $(OBJS)\forty_scorefil.obj \\r
-       $(OBJS)\forty_forty.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\forty.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe\r
-       -if exist $(OBJS)\forty.ilk del $(OBJS)\forty.ilk\r
-       -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb\r
-\r
-$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(FORTY_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\forty_forty.obj: .\forty.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\forty.cpp\r
-\r
-$(OBJS)\forty_canvas.obj: .\canvas.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\canvas.cpp\r
-\r
-$(OBJS)\forty_card.obj: .\card.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\card.cpp\r
-\r
-$(OBJS)\forty_game.obj: .\game.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\forty_pile.obj: .\pile.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\pile.cpp\r
-\r
-$(OBJS)\forty_playerdg.obj: .\playerdg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\playerdg.cpp\r
-\r
-$(OBJS)\forty_scoredg.obj: .\scoredg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scoredg.cpp\r
-\r
-$(OBJS)\forty_scorefil.obj: .\scorefil.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp\r
-\r
-$(OBJS)\forty_forty.res: .\forty.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+FORTY_OBJECTS =  \
+       $(OBJS)\forty_forty.obj \
+       $(OBJS)\forty_canvas.obj \
+       $(OBJS)\forty_card.obj \
+       $(OBJS)\forty_game.obj \
+       $(OBJS)\forty_pile.obj \
+       $(OBJS)\forty_playerdg.obj \
+       $(OBJS)\forty_scoredg.obj \
+       $(OBJS)\forty_scorefil.obj
+FORTY_RESOURCES =  \
+       $(OBJS)\forty_forty.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\forty.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
+       -if exist $(OBJS)\forty.ilk del $(OBJS)\forty.ilk
+       -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb
+
+$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(FORTY_OBJECTS) $(FORTY_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\forty_forty.obj: .\forty.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\forty.cpp
+
+$(OBJS)\forty_canvas.obj: .\canvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\canvas.cpp
+
+$(OBJS)\forty_card.obj: .\card.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\card.cpp
+
+$(OBJS)\forty_game.obj: .\game.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\game.cpp
+
+$(OBJS)\forty_pile.obj: .\pile.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\pile.cpp
+
+$(OBJS)\forty_playerdg.obj: .\playerdg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\playerdg.cpp
+
+$(OBJS)\forty_scoredg.obj: .\scoredg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scoredg.cpp
+
+$(OBJS)\forty_scorefil.obj: .\scorefil.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp
+
+$(OBJS)\forty_forty.res: .\forty.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc
+

diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat
index 5a13130632e6ef3bfee51d5dc7835d3dc5c068b2..3bf7096c63c792640b0759e2949c3b09c9de32a7 100644 (file)
--- a/demos/forty/makefile.wat
+++ b/demos/forty/makefile.wat
@@ -1,307 +1,307 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-FORTY_OBJECTS =  &\r
-       $(OBJS)\forty_forty.obj &\r
-       $(OBJS)\forty_canvas.obj &\r
-       $(OBJS)\forty_card.obj &\r
-       $(OBJS)\forty_game.obj &\r
-       $(OBJS)\forty_pile.obj &\r
-       $(OBJS)\forty_playerdg.obj &\r
-       $(OBJS)\forty_scoredg.obj &\r
-       $(OBJS)\forty_scorefil.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\forty.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe\r
-\r
-$(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res\r
-       @%create $(OBJS)\forty.lbc\r
-       @%append $(OBJS)\forty.lbc option quiet\r
-       @%append $(OBJS)\forty.lbc name $^@\r
-       @%append $(OBJS)\forty.lbc option caseexact\r
-       @%append $(OBJS)\forty.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i\r
-       @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res\r
-       @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i\r
-       wlink @$(OBJS)\forty.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\forty_forty.obj :  .AUTODEPEND .\forty.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_canvas.obj :  .AUTODEPEND .\canvas.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_card.obj :  .AUTODEPEND .\card.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_game.obj :  .AUTODEPEND .\game.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_pile.obj :  .AUTODEPEND .\pile.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_playerdg.obj :  .AUTODEPEND .\playerdg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_scoredg.obj :  .AUTODEPEND .\scoredg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_scorefil.obj :  .AUTODEPEND .\scorefil.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<\r
-\r
-$(OBJS)\forty_forty.res :  .AUTODEPEND .\forty.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+FORTY_OBJECTS =  &
+       $(OBJS)\forty_forty.obj &
+       $(OBJS)\forty_canvas.obj &
+       $(OBJS)\forty_card.obj &
+       $(OBJS)\forty_game.obj &
+       $(OBJS)\forty_pile.obj &
+       $(OBJS)\forty_playerdg.obj &
+       $(OBJS)\forty_scoredg.obj &
+       $(OBJS)\forty_scorefil.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\forty.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
+
+$(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
+       @%create $(OBJS)\forty.lbc
+       @%append $(OBJS)\forty.lbc option quiet
+       @%append $(OBJS)\forty.lbc name $^@
+       @%append $(OBJS)\forty.lbc option caseexact
+       @%append $(OBJS)\forty.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i
+       @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
+       @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i
+       wlink @$(OBJS)\forty.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\forty_forty.obj :  .AUTODEPEND .\forty.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_canvas.obj :  .AUTODEPEND .\canvas.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_card.obj :  .AUTODEPEND .\card.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_game.obj :  .AUTODEPEND .\game.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_pile.obj :  .AUTODEPEND .\pile.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_playerdg.obj :  .AUTODEPEND .\playerdg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_scoredg.obj :  .AUTODEPEND .\scoredg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_scorefil.obj :  .AUTODEPEND .\scorefil.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+
+$(OBJS)\forty_forty.res :  .AUTODEPEND .\forty.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 367ab21cd19d6184a1705e17b2cb6e33bb924480..af0521d2ec05ba28142f58a47ce7838cb620e7d1 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/fractal/fractal.dsp b/demos/fractal/fractal.dsp
index 5aad4c459b048c65982b5dfd56cb824e30ea5e2a..57b43922b12e4cc90e7bab1ffb6d20422afb49af 100644 (file)
--- a/demos/fractal/fractal.dsp
+++ b/demos/fractal/fractal.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\fractal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\fractal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\fractal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\fractal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj
index 1199047bcd97b3b37b406edafd95ab128a63a199..a6e3931a29b889a72087f2e95826dc0e56ef6fd9 100644 (file)
--- a/demos/fractal/fractal_vc7.vcproj
+++ b/demos/fractal/fractal_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/demos/fractal/fractal_vc8.vcproj b/demos/fractal/fractal_vc8.vcproj
index bbcd29739863067f7c5f4b5c5817f25d75e8bbe5..a9a9f4e7e373af8d9796ab48e08b91f7480d659e 100644 (file)
--- a/demos/fractal/fractal_vc8.vcproj
+++ b/demos/fractal/fractal_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/fractal/fractal_vc9.vcproj b/demos/fractal/fractal_vc9.vcproj
index 7f522edf10da968fb77c378c482e106b84bca016..f049d609f0c4da2b2b48f2d86d7ceb346796e165 100644 (file)
--- a/demos/fractal/fractal_vc9.vcproj
+++ b/demos/fractal/fractal_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\fractal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\fractal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc
index efd700560f2af6e7b89fd087da1e30a7bca3155f..cb4a061e6121879ab54cb10f7b42f0b7d1ac2d90 100644 (file)
--- a/demos/fractal/makefile.bcc
+++ b/demos/fractal/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FRACTAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-FRACTAL_OBJECTS =  \\r
-       $(OBJS)\fractal_fractal.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\fractal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe\r
-       -if exist $(OBJS)\fractal.tds del $(OBJS)\fractal.tds\r
-       -if exist $(OBJS)\fractal.ilc del $(OBJS)\fractal.ilc\r
-       -if exist $(OBJS)\fractal.ild del $(OBJS)\fractal.ild\r
-       -if exist $(OBJS)\fractal.ilf del $(OBJS)\fractal.ilf\r
-       -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils\r
-\r
-$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS)  $(OBJS)\fractal_fractal.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res\r
-|\r
-\r
-$(OBJS)\fractal_fractal.obj: .\fractal.cpp\r
-       $(CXX) -q -c -P -o$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp\r
-\r
-$(OBJS)\fractal_fractal.res: .\fractal.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\fractal.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FRACTAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+FRACTAL_OBJECTS =  \
+       $(OBJS)\fractal_fractal.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\fractal.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
+       -if exist $(OBJS)\fractal.tds del $(OBJS)\fractal.tds
+       -if exist $(OBJS)\fractal.ilc del $(OBJS)\fractal.ilc
+       -if exist $(OBJS)\fractal.ild del $(OBJS)\fractal.ild
+       -if exist $(OBJS)\fractal.ilf del $(OBJS)\fractal.ilf
+       -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils
+
+$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS)  $(OBJS)\fractal_fractal.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
+|
+
+$(OBJS)\fractal_fractal.obj: .\fractal.cpp
+       $(CXX) -q -c -P -o$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp
+
+$(OBJS)\fractal_fractal.res: .\fractal.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\fractal.rc
+

diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc
index a7aae3c7ba7a8aa284e163dced4c10a34594f405..5b9ce2c78dfe6d77a4e1b8aec0defcf0d6af6884 100644 (file)
--- a/demos/fractal/makefile.gcc
+++ b/demos/fractal/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FRACTAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-FRACTAL_OBJECTS =  \\r
-       $(OBJS)\fractal_fractal.o \\r
-       $(OBJS)\fractal_fractal_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\fractal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe\r
-\r
-$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o\r
-       $(CXX) -o $@ $(FRACTAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\fractal_fractal.o: ./fractal.cpp\r
-       $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\fractal_fractal_rc.o: ./fractal.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FRACTAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+FRACTAL_OBJECTS =  \
+       $(OBJS)\fractal_fractal.o \
+       $(OBJS)\fractal_fractal_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\fractal.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
+
+$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
+       $(CXX) -o $@ $(FRACTAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\fractal_fractal.o: ./fractal.cpp
+       $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\fractal_fractal_rc.o: ./fractal.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc
index 4de9f7d7da0137f93a5d7343bbd679bbef1ac2e2..2e6e97ef289f2f6d6a87cb5fa5639334681f7022 100644 (file)
--- a/demos/fractal/makefile.vc
+++ b/demos/fractal/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-FRACTAL_OBJECTS =  \\r
-       $(OBJS)\fractal_fractal.obj \\r
-       $(OBJS)\fractal_fractal.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\fractal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe\r
-       -if exist $(OBJS)\fractal.ilk del $(OBJS)\fractal.ilk\r
-       -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb\r
-\r
-$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(FRACTAL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\fractal_fractal.obj: .\fractal.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp\r
-\r
-$(OBJS)\fractal_fractal.res: .\fractal.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+FRACTAL_OBJECTS =  \
+       $(OBJS)\fractal_fractal.obj
+FRACTAL_RESOURCES =  \
+       $(OBJS)\fractal_fractal.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\fractal.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
+       -if exist $(OBJS)\fractal.ilk del $(OBJS)\fractal.ilk
+       -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb
+
+$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\fractal_fractal.obj: .\fractal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp
+
+$(OBJS)\fractal_fractal.res: .\fractal.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc
+

diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat
index e4e8c1b803b182a10dce4e9c2d13fcec781d3472..8cc30c61b9e104e581572d0dc6a6c1055fc5cafc 100644 (file)
--- a/demos/fractal/makefile.wat
+++ b/demos/fractal/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-FRACTAL_OBJECTS =  &\r
-       $(OBJS)\fractal_fractal.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\fractal.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe\r
-\r
-$(OBJS)\fractal.exe :  $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res\r
-       @%create $(OBJS)\fractal.lbc\r
-       @%append $(OBJS)\fractal.lbc option quiet\r
-       @%append $(OBJS)\fractal.lbc name $^@\r
-       @%append $(OBJS)\fractal.lbc option caseexact\r
-       @%append $(OBJS)\fractal.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %i\r
-       @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res\r
-       @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i\r
-       wlink @$(OBJS)\fractal.lbc\r
-\r
-$(OBJS)\fractal_fractal.obj :  .AUTODEPEND .\fractal.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $<\r
-\r
-$(OBJS)\fractal_fractal.res :  .AUTODEPEND .\fractal.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+FRACTAL_OBJECTS =  &
+       $(OBJS)\fractal_fractal.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\fractal.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
+
+$(OBJS)\fractal.exe :  $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res
+       @%create $(OBJS)\fractal.lbc
+       @%append $(OBJS)\fractal.lbc option quiet
+       @%append $(OBJS)\fractal.lbc name $^@
+       @%append $(OBJS)\fractal.lbc option caseexact
+       @%append $(OBJS)\fractal.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %i
+       @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res
+       @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i
+       wlink @$(OBJS)\fractal.lbc
+
+$(OBJS)\fractal_fractal.obj :  .AUTODEPEND .\fractal.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $<
+
+$(OBJS)\fractal_fractal.res :  .AUTODEPEND .\fractal.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 973f22048e9a11273e352742368d1b0b14bb0201..b8849a498bc75f4da8cba6cacdb12668e38759d0 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/life/life.dsp b/demos/life/life.dsp
index ff7c537f62cd5ef4947b5f62b59bb800b80c7c88..d8f349aec1337f7f1c0853652001734c2cb0b033 100644 (file)
--- a/demos/life/life.dsp
+++ b/demos/life/life.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\life"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\life"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\life"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\life"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj
index 2ebd2e66c81f3fb702ab000650009c09698e2deb..26243b68c30d1c72d0eadb2d15b77a6990af7142 100644 (file)
--- a/demos/life/life_vc7.vcproj
+++ b/demos/life/life_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\life.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\life.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/demos/life/life_vc8.vcproj b/demos/life/life_vc8.vcproj
index 55eafbdc42f938cad9e5245f13e53631ee922e92..edb3dd025723461d3e91b7c6553271020adc0cb7 100644 (file)
--- a/demos/life/life_vc8.vcproj
+++ b/demos/life/life_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/life/life_vc9.vcproj b/demos/life/life_vc9.vcproj
index 1798d1009c5863fe1c02019f472f4f847b285d00..3bc201022d9fb11e688c4a4260a19d83934d9c05 100644 (file)
--- a/demos/life/life_vc9.vcproj
+++ b/demos/life/life_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\life.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\life.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index 2868a8a12a7445160c0ba4f6e8b6fe6bb643d50a..1f4494532130ce4259a5bf104f208beed650de3e 100644 (file)
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LIFE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-LIFE_OBJECTS =  \\r
-       $(OBJS)\life_life.obj \\r
-       $(OBJS)\life_dialogs.obj \\r
-       $(OBJS)\life_game.obj \\r
-       $(OBJS)\life_reader.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\life.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe\r
-       -if exist $(OBJS)\life.tds del $(OBJS)\life.tds\r
-       -if exist $(OBJS)\life.ilc del $(OBJS)\life.ilc\r
-       -if exist $(OBJS)\life.ild del $(OBJS)\life.ild\r
-       -if exist $(OBJS)\life.ilf del $(OBJS)\life.ilf\r
-       -if exist $(OBJS)\life.ils del $(OBJS)\life.ils\r
-\r
-$(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\life_life.obj: .\life.cpp\r
-       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\life.cpp\r
-\r
-$(OBJS)\life_dialogs.obj: .\dialogs.cpp\r
-       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\dialogs.cpp\r
-\r
-$(OBJS)\life_game.obj: .\game.cpp\r
-       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\life_reader.obj: .\reader.cpp\r
-       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\reader.cpp\r
-\r
-$(OBJS)\life_life.res: .\life.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\life.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LIFE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+LIFE_OBJECTS =  \
+       $(OBJS)\life_life.obj \
+       $(OBJS)\life_dialogs.obj \
+       $(OBJS)\life_game.obj \
+       $(OBJS)\life_reader.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\life.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
+       -if exist $(OBJS)\life.tds del $(OBJS)\life.tds
+       -if exist $(OBJS)\life.ilc del $(OBJS)\life.ilc
+       -if exist $(OBJS)\life.ild del $(OBJS)\life.ild
+       -if exist $(OBJS)\life.ilf del $(OBJS)\life.ilf
+       -if exist $(OBJS)\life.ils del $(OBJS)\life.ils
+
+$(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\life_life.obj: .\life.cpp
+       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\life.cpp
+
+$(OBJS)\life_dialogs.obj: .\dialogs.cpp
+       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\dialogs.cpp
+
+$(OBJS)\life_game.obj: .\game.cpp
+       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\game.cpp
+
+$(OBJS)\life_reader.obj: .\reader.cpp
+       $(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\reader.cpp
+
+$(OBJS)\life_life.res: .\life.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\life.rc
+

diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc
index 120622c00cac7ebb6d1ae4478b8e6a000c951a3c..3d1f6acb180471b8bd644556f2d8acf459a22633 100644 (file)
--- a/demos/life/makefile.gcc
+++ b/demos/life/makefile.gcc
@@ -1,242 +1,242 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LIFE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-LIFE_OBJECTS =  \\r
-       $(OBJS)\life_life.o \\r
-       $(OBJS)\life_dialogs.o \\r
-       $(OBJS)\life_game.o \\r
-       $(OBJS)\life_reader.o \\r
-       $(OBJS)\life_life_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\life.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe\r
-\r
-$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o\r
-       $(CXX) -o $@ $(LIFE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (breeder.lif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\life_life.o: ./life.cpp\r
-       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\life_dialogs.o: ./dialogs.cpp\r
-       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\life_game.o: ./game.cpp\r
-       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\life_reader.o: ./reader.cpp\r
-       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\life_life_rc.o: ./life.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LIFE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+LIFE_OBJECTS =  \
+       $(OBJS)\life_life.o \
+       $(OBJS)\life_dialogs.o \
+       $(OBJS)\life_game.o \
+       $(OBJS)\life_reader.o \
+       $(OBJS)\life_life_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\life.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
+
+$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
+       $(CXX) -o $@ $(LIFE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (breeder.lif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\life_life.o: ./life.cpp
+       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\life_dialogs.o: ./dialogs.cpp
+       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\life_game.o: ./game.cpp
+       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\life_reader.o: ./reader.cpp
+       $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\life_life_rc.o: ./life.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 5cfb405131749f710a4ee498de2643a428d4602b..2b578658c92b7d67d0a8d42797e9cee565422bae 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -1,327 +1,352 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-LIFE_OBJECTS =  \\r
-       $(OBJS)\life_life.obj \\r
-       $(OBJS)\life_dialogs.obj \\r
-       $(OBJS)\life_game.obj \\r
-       $(OBJS)\life_reader.obj \\r
-       $(OBJS)\life_life.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\life.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe\r
-       -if exist $(OBJS)\life.ilk del $(OBJS)\life.ilk\r
-       -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb\r
-\r
-$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(LIFE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\life_life.obj: .\life.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\life.cpp\r
-\r
-$(OBJS)\life_dialogs.obj: .\dialogs.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\dialogs.cpp\r
-\r
-$(OBJS)\life_game.obj: .\game.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\game.cpp\r
-\r
-$(OBJS)\life_reader.obj: .\reader.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp\r
-\r
-$(OBJS)\life_life.res: .\life.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+LIFE_OBJECTS =  \
+       $(OBJS)\life_life.obj \
+       $(OBJS)\life_dialogs.obj \
+       $(OBJS)\life_game.obj \
+       $(OBJS)\life_reader.obj
+LIFE_RESOURCES =  \
+       $(OBJS)\life_life.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\life.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
+       -if exist $(OBJS)\life.ilk del $(OBJS)\life.ilk
+       -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb
+
+$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(LIFE_OBJECTS) $(LIFE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\life_life.obj: .\life.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\life.cpp
+
+$(OBJS)\life_dialogs.obj: .\dialogs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\dialogs.cpp
+
+$(OBJS)\life_game.obj: .\game.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\game.cpp
+
+$(OBJS)\life_reader.obj: .\reader.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp
+
+$(OBJS)\life_life.res: .\life.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc
+

diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat
index fc956d35192a7ca26d6fa39ae6c6cc2eace2a107..d6c3f42148d6105806d46f9e6ac012e9e4d2cffd 100644 (file)
--- a/demos/life/makefile.wat
+++ b/demos/life/makefile.wat
@@ -1,276 +1,276 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-LIFE_OBJECTS =  &\r
-       $(OBJS)\life_life.obj &\r
-       $(OBJS)\life_dialogs.obj &\r
-       $(OBJS)\life_game.obj &\r
-       $(OBJS)\life_reader.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\life.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe\r
-\r
-$(OBJS)\life.exe :  $(LIFE_OBJECTS) $(OBJS)\life_life.res\r
-       @%create $(OBJS)\life.lbc\r
-       @%append $(OBJS)\life.lbc option quiet\r
-       @%append $(OBJS)\life.lbc name $^@\r
-       @%append $(OBJS)\life.lbc option caseexact\r
-       @%append $(OBJS)\life.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %i\r
-       @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res\r
-       @for %i in () do @%append $(OBJS)\life.lbc option stack=%i\r
-       wlink @$(OBJS)\life.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\life_life.obj :  .AUTODEPEND .\life.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<\r
-\r
-$(OBJS)\life_dialogs.obj :  .AUTODEPEND .\dialogs.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<\r
-\r
-$(OBJS)\life_game.obj :  .AUTODEPEND .\game.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<\r
-\r
-$(OBJS)\life_reader.obj :  .AUTODEPEND .\reader.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<\r
-\r
-$(OBJS)\life_life.res :  .AUTODEPEND .\life.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+LIFE_OBJECTS =  &
+       $(OBJS)\life_life.obj &
+       $(OBJS)\life_dialogs.obj &
+       $(OBJS)\life_game.obj &
+       $(OBJS)\life_reader.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\life.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\life.exe del $(OBJS)\life.exe
+
+$(OBJS)\life.exe :  $(LIFE_OBJECTS) $(OBJS)\life_life.res
+       @%create $(OBJS)\life.lbc
+       @%append $(OBJS)\life.lbc option quiet
+       @%append $(OBJS)\life.lbc name $^@
+       @%append $(OBJS)\life.lbc option caseexact
+       @%append $(OBJS)\life.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %i
+       @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res
+       @for %i in () do @%append $(OBJS)\life.lbc option stack=%i
+       wlink @$(OBJS)\life.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\life_life.obj :  .AUTODEPEND .\life.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<
+
+$(OBJS)\life_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<
+
+$(OBJS)\life_game.obj :  .AUTODEPEND .\game.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<
+
+$(OBJS)\life_reader.obj :  .AUTODEPEND .\reader.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $<
+
+$(OBJS)\life_life.res :  .AUTODEPEND .\life.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/demos/makefile.bcc b/demos/makefile.bcc
index 45354712fbaca323c9cf8bc51a6b4bbc9b3181a9..8cd3caa3ebd721fa5270030fffd7b72f510d13db 100644 (file)
--- a/demos/makefile.bcc
+++ b/demos/makefile.bcc
@@ -1,103 +1,103 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \\r
-       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \\r
-       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \\r
-       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \\r
-       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \\r
-       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \\r
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \\r
-       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \\r
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
-       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
-       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
-       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: bombs forty fractal life poem\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.csm del .\*.csm\r
-       @echo cd bombs >bombs.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat\r
-       call bombs.bat\r
-       @del bombs.bat\r
-       @echo cd forty >forty.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat\r
-       call forty.bat\r
-       @del forty.bat\r
-       @echo cd fractal >fractal.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat\r
-       call fractal.bat\r
-       @del fractal.bat\r
-       @echo cd life >life.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat\r
-       call life.bat\r
-       @del life.bat\r
-       @echo cd poem >poem.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat\r
-       call poem.bat\r
-       @del poem.bat\r
-\r
-bombs: \r
-       @echo cd bombs >bombs.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat\r
-       call bombs.bat\r
-       @del bombs.bat\r
-\r
-forty: \r
-       @echo cd forty >forty.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat\r
-       call forty.bat\r
-       @del forty.bat\r
-\r
-fractal: \r
-       @echo cd fractal >fractal.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat\r
-       call fractal.bat\r
-       @del fractal.bat\r
-\r
-life: \r
-       @echo cd life >life.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat\r
-       call life.bat\r
-       @del life.bat\r
-\r
-poem: \r
-       @echo cd poem >poem.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat\r
-       call poem.bat\r
-       @del poem.bat\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
+       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: bombs forty fractal life poem
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd bombs >bombs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat
+       call bombs.bat
+       @del bombs.bat
+       @echo cd forty >forty.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat
+       call forty.bat
+       @del forty.bat
+       @echo cd fractal >fractal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat
+       call fractal.bat
+       @del fractal.bat
+       @echo cd life >life.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat
+       call life.bat
+       @del life.bat
+       @echo cd poem >poem.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat
+       call poem.bat
+       @del poem.bat
+
+bombs: 
+       @echo cd bombs >bombs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat
+       call bombs.bat
+       @del bombs.bat
+
+forty: 
+       @echo cd forty >forty.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat
+       call forty.bat
+       @del forty.bat
+
+fractal: 
+       @echo cd fractal >fractal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat
+       call fractal.bat
+       @del fractal.bat
+
+life: 
+       @echo cd life >life.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat
+       call life.bat
+       @del life.bat
+
+poem: 
+       @echo cd poem >poem.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat
+       call poem.bat
+       @del poem.bat
+

diff --git a/demos/makefile.gcc b/demos/makefile.gcc
index 7dc8bec44060c844567a473da6fee4eff296798d..445a7f2f8148ccf2e4e85f63782a4662fa46bafa 100644 (file)
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -1,71 +1,71 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: bombs forty fractal life poem\r
-\r
-clean: \r
-       -if exist .\*.o del .\*.o\r
-       -if exist .\*.d del .\*.d\r
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean\r
-\r
-bombs: \r
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all\r
-\r
-forty: \r
-       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all\r
-\r
-fractal: \r
-       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all\r
-\r
-life: \r
-       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all\r
-\r
-poem: \r
-       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all\r
-\r
-.PHONY: all clean bombs forty fractal life poem\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include ./*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: bombs forty fractal life poem
+
+clean: 
+       -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean
+
+bombs: 
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
+
+forty: 
+       $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all
+
+fractal: 
+       $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all
+
+life: 
+       $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all
+
+poem: 
+       $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean bombs forty fractal life poem
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d

diff --git a/demos/makefile.vc b/demos/makefile.vc
index 7d0ce6cf4043d0d175a27acfbfa2fb9f98a7a8af..4042bd609cd5cd558fadb234b64fa56c93e153d6 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -1,84 +1,84 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
-       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: sub_bombs sub_forty sub_fractal sub_life sub_poem\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.pch del .\*.pch\r
-       cd bombs\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd forty\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd fractal\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd life\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd poem\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_bombs: \r
-       cd bombs\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_forty: \r
-       cd forty\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_fractal: \r
-       cd fractal\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_life: \r
-       cd life\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_poem: \r
-       cd poem\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_bombs sub_forty sub_fractal sub_life sub_poem
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd bombs
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd forty
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd fractal
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd life
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd poem
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+
+sub_bombs: 
+       cd bombs
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_forty: 
+       cd forty
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_fractal: 
+       cd fractal
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_life: 
+       cd life
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_poem: 
+       cd poem
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+

diff --git a/demos/makefile.wat b/demos/makefile.wat
index 300d01a04b0386780a43d274eebadd21cba88c8c..cb662fede2d7efe526e9d5c4c1c978af69fb4f24 100644 (file)
--- a/demos/makefile.wat
+++ b/demos/makefile.wat
@@ -1,104 +1,104 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC bombs forty fractal life poem\r
-\r
-clean : .SYMBOLIC \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.lbc del .\*.lbc\r
-       -if exist .\*.ilk del .\*.ilk\r
-       -if exist .\*.pch del .\*.pch\r
-       cd bombs\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd forty\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd fractal\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd life\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd poem\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-\r
-bombs : .SYMBOLIC \r
-       cd bombs\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-forty : .SYMBOLIC \r
-       cd forty\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-fractal : .SYMBOLIC \r
-       cd fractal\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-life : .SYMBOLIC \r
-       cd life\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-poem : .SYMBOLIC \r
-       cd poem\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+
+### Targets: ###
+
+all : .SYMBOLIC bombs forty fractal life poem
+
+clean : .SYMBOLIC 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd bombs
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd forty
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd fractal
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd life
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd poem
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+bombs : .SYMBOLIC 
+       cd bombs
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+forty : .SYMBOLIC 
+       cd forty
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+fractal : .SYMBOLIC 
+       cd fractal
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+life : .SYMBOLIC 
+       cd life
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+poem : .SYMBOLIC 
+       cd poem
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index ffba055cc5cf48e96ec38a615829e375f45d962d..251b5ad472ccf4a985687b2441b4a5783f1a280e 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc
index c9a789879173004550dfb97e4875b4efd59cc341..3476fdb312f0a239d218939c79e3fe669805a8b0 100644 (file)
--- a/demos/poem/makefile.bcc
+++ b/demos/poem/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WXPOEM_OBJECTS =  \\r
-       $(OBJS)\wxpoem_wxpoem.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxpoem.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe\r
-       -if exist $(OBJS)\wxpoem.tds del $(OBJS)\wxpoem.tds\r
-       -if exist $(OBJS)\wxpoem.ilc del $(OBJS)\wxpoem.ilc\r
-       -if exist $(OBJS)\wxpoem.ild del $(OBJS)\wxpoem.ild\r
-       -if exist $(OBJS)\wxpoem.ilf del $(OBJS)\wxpoem.ilf\r
-       -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils\r
-\r
-$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS)  $(OBJS)\wxpoem_wxpoem.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp\r
-       $(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp\r
-\r
-$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WXPOEM_OBJECTS =  \
+       $(OBJS)\wxpoem_wxpoem.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxpoem.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
+       -if exist $(OBJS)\wxpoem.tds del $(OBJS)\wxpoem.tds
+       -if exist $(OBJS)\wxpoem.ilc del $(OBJS)\wxpoem.ilc
+       -if exist $(OBJS)\wxpoem.ild del $(OBJS)\wxpoem.ild
+       -if exist $(OBJS)\wxpoem.ilf del $(OBJS)\wxpoem.ilf
+       -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils
+
+$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS)  $(OBJS)\wxpoem_wxpoem.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp
+       $(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp
+
+$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc
+

diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc
index 2326ee3841c5efbf9aa16f77492f4f5f1866901a..3fc5561bf229824084fdd6bc818e7837c3f4537f 100644 (file)
--- a/demos/poem/makefile.gcc
+++ b/demos/poem/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WXPOEM_OBJECTS =  \\r
-       $(OBJS)\wxpoem_wxpoem.o \\r
-       $(OBJS)\wxpoem_wxpoem_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxpoem.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe\r
-\r
-$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o\r
-       $(CXX) -o $@ $(WXPOEM_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\wxpoem_wxpoem.o: ./wxpoem.cpp\r
-       $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WXPOEM_OBJECTS =  \
+       $(OBJS)\wxpoem_wxpoem.o \
+       $(OBJS)\wxpoem_wxpoem_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxpoem.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
+
+$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
+       $(CXX) -o $@ $(WXPOEM_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\wxpoem_wxpoem.o: ./wxpoem.cpp
+       $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc
index 3cdf79ecf7643066a26cd5c9eb66c1a62dd8903c..1fae9bca85142c0ab27a811012e179b657715123 100644 (file)
--- a/demos/poem/makefile.vc
+++ b/demos/poem/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-WXPOEM_OBJECTS =  \\r
-       $(OBJS)\wxpoem_wxpoem.obj \\r
-       $(OBJS)\wxpoem_wxpoem.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxpoem.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe\r
-       -if exist $(OBJS)\wxpoem.ilk del $(OBJS)\wxpoem.ilk\r
-       -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb\r
-\r
-$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WXPOEM_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp\r
-\r
-$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WXPOEM_OBJECTS =  \
+       $(OBJS)\wxpoem_wxpoem.obj
+WXPOEM_RESOURCES =  \
+       $(OBJS)\wxpoem_wxpoem.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxpoem.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
+       -if exist $(OBJS)\wxpoem.ilk del $(OBJS)\wxpoem.ilk
+       -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb
+
+$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp
+
+$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc
+

diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat
index 9bfab9131070b2fa09334bcc15da9a5caa32d75d..03a5f4368d008a8e15ba38984fed654937d037c9 100644 (file)
--- a/demos/poem/makefile.wat
+++ b/demos/poem/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-WXPOEM_OBJECTS =  &\r
-       $(OBJS)\wxpoem_wxpoem.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\wxpoem.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe\r
-\r
-$(OBJS)\wxpoem.exe :  $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res\r
-       @%create $(OBJS)\wxpoem.lbc\r
-       @%append $(OBJS)\wxpoem.lbc option quiet\r
-       @%append $(OBJS)\wxpoem.lbc name $^@\r
-       @%append $(OBJS)\wxpoem.lbc option caseexact\r
-       @%append $(OBJS)\wxpoem.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i\r
-       @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res\r
-       @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i\r
-       wlink @$(OBJS)\wxpoem.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxpoem_wxpoem.obj :  .AUTODEPEND .\wxpoem.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $<\r
-\r
-$(OBJS)\wxpoem_wxpoem.res :  .AUTODEPEND .\wxpoem.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+WXPOEM_OBJECTS =  &
+       $(OBJS)\wxpoem_wxpoem.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\wxpoem.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
+
+$(OBJS)\wxpoem.exe :  $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res
+       @%create $(OBJS)\wxpoem.lbc
+       @%append $(OBJS)\wxpoem.lbc option quiet
+       @%append $(OBJS)\wxpoem.lbc name $^@
+       @%append $(OBJS)\wxpoem.lbc option caseexact
+       @%append $(OBJS)\wxpoem.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i
+       @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res
+       @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i
+       wlink @$(OBJS)\wxpoem.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxpoem_wxpoem.obj :  .AUTODEPEND .\wxpoem.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $<
+
+$(OBJS)\wxpoem_wxpoem.res :  .AUTODEPEND .\wxpoem.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/demos/poem/poem.dsp b/demos/poem/poem.dsp
index 5888ba0a07b3a34151a45a07f6c00977c7c29998..83d8d3fe7bec6c906809f084daac904766ddcfa3 100644 (file)
--- a/demos/poem/poem.dsp
+++ b/demos/poem/poem.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxpoem"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxpoem"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxpoem"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\wxpoem"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj
index 6f0495a7e93419a39c3985678e1fabdafcad39f0..bbecac175bd2992260eabeb7b051159c2449be34 100644 (file)
--- a/demos/poem/poem_vc7.vcproj
+++ b/demos/poem/poem_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/demos/poem/poem_vc8.vcproj b/demos/poem/poem_vc8.vcproj
index b871df68ee6672480b5e72e650641d41018689e9..5ccbb1a5a511eb821993c669109c1066a16ef0a6 100644 (file)
--- a/demos/poem/poem_vc8.vcproj
+++ b/demos/poem/poem_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/demos/poem/poem_vc9.vcproj b/demos/poem/poem_vc9.vcproj
index 958f529834f0f717480427fd81a3229d6cb2bc46..ed82c3145e00c86e8bc2b35b9ee0f709fff94c96 100644 (file)
--- a/demos/poem/poem_vc9.vcproj
+++ b/demos/poem/poem_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxpoem.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index f6eaad8904fc0ea3d0bff403b25772f100e61e39..9a5d74c9da67d2f7ad2c9b7259638e8362127467 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/access/access.dsp b/samples/access/access.dsp
index 7d19f25913203a8458b5d55fa263f48ae7ed79d1..a9974fbc9c5b8a2154ed30326c04c0fa1ab6e736 100644 (file)
--- a/samples/access/access.dsp
+++ b/samples/access/access.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\accesstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\accesstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\accesstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\accesstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\accesstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\accesstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj
index 207319c5a3c3fc67e09a234f022d013442c2f0fa..be304092b41302ab03b237012a77a5e9db69b5db 100644 (file)
--- a/samples/access/access_vc7.vcproj
+++ b/samples/access/access_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\accesstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\accesstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\accesstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj
index 29ce1769b82032605ae49987810615b05813f6ce..f278e288095de2914bfbd824f02bd927e01940b5 100644 (file)
--- a/samples/access/access_vc8.vcproj
+++ b/samples/access/access_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj
index ed233488e05c058f87550e3049c8e8b91130e890..768b2e0c86a1d063e4ae902850fa5d237548556d 100644 (file)
--- a/samples/access/access_vc9.vcproj
+++ b/samples/access/access_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\accesstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc
index 2845944ed201657d0b9b9adea5bee8947db9a7d8..f4985050ecf8bd242f706f35c180fd1cee7bff83 100644 (file)
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ACCESSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ACCESSTEST_OBJECTS =  \\r
-       $(OBJS)\accesstest_accesstest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\accesstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
-       -if exist $(OBJS)\accesstest.tds del $(OBJS)\accesstest.tds\r
-       -if exist $(OBJS)\accesstest.ilc del $(OBJS)\accesstest.ilc\r
-       -if exist $(OBJS)\accesstest.ild del $(OBJS)\accesstest.ild\r
-       -if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf\r
-       -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils\r
-\r
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS)  $(OBJS)\accesstest_accesstest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_accesstest.res\r
-|\r
-\r
-$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp\r
-       $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
-\r
-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\accesstest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ACCESSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ACCESSTEST_OBJECTS =  \
+       $(OBJS)\accesstest_accesstest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\accesstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
+       -if exist $(OBJS)\accesstest.tds del $(OBJS)\accesstest.tds
+       -if exist $(OBJS)\accesstest.ilc del $(OBJS)\accesstest.ilc
+       -if exist $(OBJS)\accesstest.ild del $(OBJS)\accesstest.ild
+       -if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf
+       -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils
+
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS)  $(OBJS)\accesstest_accesstest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_accesstest.res
+|
+
+$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp
+       $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp
+
+$(OBJS)\accesstest_accesstest.res: .\accesstest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\accesstest.rc
+

diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index eeee4877ad64d2c9bdabe5bfb5997435789783ef..0bf0d26f55d6764500f070431523fd420adb9fa5 100644 (file)
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ACCESSTEST_OBJECTS =  \\r
-       $(OBJS)\accesstest_accesstest.o \\r
-       $(OBJS)\accesstest_accesstest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\accesstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
-\r
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o\r
-       $(CXX) -o $@ $(ACCESSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp\r
-       $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ACCESSTEST_OBJECTS =  \
+       $(OBJS)\accesstest_accesstest.o \
+       $(OBJS)\accesstest_accesstest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\accesstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
+
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o
+       $(CXX) -o $@ $(ACCESSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp
+       $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx
index 618b644640700eab34bcae7168ccc27ad1e7cd69..20490d864c9f21c85f2f1e6f2567a5fa23b76e1a 100644 (file)
--- a/samples/access/makefile.unx
+++ b/samples/access/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index c53db2e6343b2755f682f8426fce688492747e2a..dff74ac77f19451cbfaec653e7f09dcddcca9f29 100644 (file)
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-ACCESSTEST_OBJECTS =  \\r
-       $(OBJS)\accesstest_accesstest.obj \\r
-       $(OBJS)\accesstest_accesstest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\accesstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
-       -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk\r
-       -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb\r
-\r
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ACCESSTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
-\r
-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ACCESSTEST_OBJECTS =  \
+       $(OBJS)\accesstest_accesstest.obj
+ACCESSTEST_RESOURCES =  \
+       $(OBJS)\accesstest_accesstest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\accesstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
+       -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk
+       -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb
+
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp
+
+$(OBJS)\accesstest_accesstest.res: .\accesstest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc
+

diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index c846239c3c96fb92709469fbbae234c8974b7a13..71a525186cc11e53a490da359d02885edf3c6463 100644 (file)
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-ACCESSTEST_OBJECTS =  &\r
-       $(OBJS)\accesstest_accesstest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\accesstest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
-\r
-$(OBJS)\accesstest.exe :  $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res\r
-       @%create $(OBJS)\accesstest.lbc\r
-       @%append $(OBJS)\accesstest.lbc option quiet\r
-       @%append $(OBJS)\accesstest.lbc name $^@\r
-       @%append $(OBJS)\accesstest.lbc option caseexact\r
-       @%append $(OBJS)\accesstest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i\r
-       @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res\r
-       @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i\r
-       wlink @$(OBJS)\accesstest.lbc\r
-\r
-$(OBJS)\accesstest_accesstest.obj :  .AUTODEPEND .\accesstest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\accesstest_accesstest.res :  .AUTODEPEND .\accesstest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+ACCESSTEST_OBJECTS =  &
+       $(OBJS)\accesstest_accesstest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\accesstest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
+
+$(OBJS)\accesstest.exe :  $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
+       @%create $(OBJS)\accesstest.lbc
+       @%append $(OBJS)\accesstest.lbc option quiet
+       @%append $(OBJS)\accesstest.lbc name $^@
+       @%append $(OBJS)\accesstest.lbc option caseexact
+       @%append $(OBJS)\accesstest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i
+       @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res
+       @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i
+       wlink @$(OBJS)\accesstest.lbc
+
+$(OBJS)\accesstest_accesstest.obj :  .AUTODEPEND .\accesstest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<
+
+$(OBJS)\accesstest_accesstest.res :  .AUTODEPEND .\accesstest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 24fc6c6450ac3257418a669d64a2763283b2ce85..4dabd60ca6fc2bdb79c4e8cc12993c5c665af91c 100644 (file)
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/animate/anitest.dsp b/samples/animate/anitest.dsp
index f31b1c3f10e12860a2c0f32bcac746c4f6c6347a..96083d90143113fa7d3aa231d569350c2fd15576 100644 (file)
--- a/samples/animate/anitest.dsp
+++ b/samples/animate/anitest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\anitest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\anitest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\anitest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\anitest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj
index 7d1b005e6bbbb0db1ec9b3f3206c90a8a4b77400..ab3f4de18c9d5aaef247a97ab311d54eeb329746 100644 (file)
--- a/samples/animate/anitest_vc7.vcproj
+++ b/samples/animate/anitest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\anitest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\anitest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\anitest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\anitest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj
index 97f5fc0c63bde4e89625a6326f3942e9b200649e..9c354a5d84ba53bff26ae2c5ff0ad1a0c0e3a8e7 100644 (file)
--- a/samples/animate/anitest_vc8.vcproj
+++ b/samples/animate/anitest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/animate/anitest_vc9.vcproj b/samples/animate/anitest_vc9.vcproj
index 2e780d8b7591e8bd48f497d6c9758684930a5eba..d1e01eb4b9e5b0dbbb926ad3c9f2039559cb931d 100644 (file)
--- a/samples/animate/anitest_vc9.vcproj
+++ b/samples/animate/anitest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\anitest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\anitest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc
index 2ea35ffea7b7f04906a4f4a7a3912f0ead1f326a..d321c064b19a6c385eafc9c7680a511737db7497 100644 (file)
--- a/samples/animate/makefile.bcc
+++ b/samples/animate/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ANITEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ANITEST_OBJECTS =  \\r
-       $(OBJS)\anitest_anitest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\anitest.exe catalog\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe\r
-       -if exist $(OBJS)\anitest.tds del $(OBJS)\anitest.tds\r
-       -if exist $(OBJS)\anitest.ilc del $(OBJS)\anitest.ilc\r
-       -if exist $(OBJS)\anitest.ild del $(OBJS)\anitest.ild\r
-       -if exist $(OBJS)\anitest.ilf del $(OBJS)\anitest.ilf\r
-       -if exist $(OBJS)\anitest.ils del $(OBJS)\anitest.ils\r
-\r
-$(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res\r
-|\r
-\r
-catalog: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\anitest_anitest.obj: .\anitest.cpp\r
-       $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) .\anitest.cpp\r
-\r
-$(OBJS)\anitest_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ANITEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ANITEST_OBJECTS =  \
+       $(OBJS)\anitest_anitest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\anitest.exe catalog
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
+       -if exist $(OBJS)\anitest.tds del $(OBJS)\anitest.tds
+       -if exist $(OBJS)\anitest.ilc del $(OBJS)\anitest.ilc
+       -if exist $(OBJS)\anitest.ild del $(OBJS)\anitest.ild
+       -if exist $(OBJS)\anitest.ilf del $(OBJS)\anitest.ilf
+       -if exist $(OBJS)\anitest.ils del $(OBJS)\anitest.ils
+
+$(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
+|
+
+catalog: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\anitest_anitest.obj: .\anitest.cpp
+       $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) .\anitest.cpp
+
+$(OBJS)\anitest_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc
index 9a1d5949138296456f6c74b4e6666045339f5487..ee6dd6cd1ba5a0c78c6f3ba968910761f9ab7252 100644 (file)
--- a/samples/animate/makefile.gcc
+++ b/samples/animate/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ANITEST_OBJECTS =  \\r
-       $(OBJS)\anitest_anitest.o \\r
-       $(OBJS)\anitest_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\anitest.exe catalog\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe\r
-\r
-$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o\r
-       $(CXX) -o $@ $(ANITEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-catalog: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\anitest_anitest.o: ./anitest.cpp\r
-       $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\anitest_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean catalog\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ANITEST_OBJECTS =  \
+       $(OBJS)\anitest_anitest.o \
+       $(OBJS)\anitest_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\anitest.exe catalog
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
+
+$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o
+       $(CXX) -o $@ $(ANITEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+catalog: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\anitest_anitest.o: ./anitest.cpp
+       $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\anitest_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean catalog
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx
index 3d74203f3f9d6f942829dc1747ccfa190e7ffa3c..edc4428e58999d651f3219d39958938a7193a7bb 100644 (file)
--- a/samples/animate/makefile.unx
+++ b/samples/animate/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc
index 2ec7ae5509de71de29d3e09dbebf1e125d8f21b2..7b7174492d8a7834e3cf69d18c0b8f454b8dc05f 100644 (file)
--- a/samples/animate/makefile.vc
+++ b/samples/animate/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-ANITEST_OBJECTS =  \\r
-       $(OBJS)\anitest_anitest.obj \\r
-       $(OBJS)\anitest_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\anitest.exe catalog\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe\r
-       -if exist $(OBJS)\anitest.ilk del $(OBJS)\anitest.ilk\r
-       -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb\r
-\r
-$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ANITEST_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-catalog: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\anitest_anitest.obj: .\anitest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp\r
-\r
-$(OBJS)\anitest_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ANITEST_OBJECTS =  \
+       $(OBJS)\anitest_anitest.obj
+ANITEST_RESOURCES =  \
+       $(OBJS)\anitest_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\anitest.exe catalog
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
+       -if exist $(OBJS)\anitest.ilk del $(OBJS)\anitest.ilk
+       -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb
+
+$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ANITEST_OBJECTS) $(ANITEST_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+catalog: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\anitest_anitest.obj: .\anitest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp
+
+$(OBJS)\anitest_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat
index c95dc679c1ce3e9b8a1eff25ca295ba7cb1872a9..c7c46b547538a0705ccdef8e972404af04550d71 100644 (file)
--- a/samples/animate/makefile.wat
+++ b/samples/animate/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-ANITEST_OBJECTS =  &\r
-       $(OBJS)\anitest_anitest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\anitest.exe catalog\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe\r
-\r
-$(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res\r
-       @%create $(OBJS)\anitest.lbc\r
-       @%append $(OBJS)\anitest.lbc option quiet\r
-       @%append $(OBJS)\anitest.lbc name $^@\r
-       @%append $(OBJS)\anitest.lbc option caseexact\r
-       @%append $(OBJS)\anitest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i\r
-       @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res\r
-       @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i\r
-       wlink @$(OBJS)\anitest.lbc\r
-\r
-catalog : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\anitest_anitest.obj :  .AUTODEPEND .\anitest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\anitest_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+ANITEST_OBJECTS =  &
+       $(OBJS)\anitest_anitest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\anitest.exe catalog
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
+
+$(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res
+       @%create $(OBJS)\anitest.lbc
+       @%append $(OBJS)\anitest.lbc option quiet
+       @%append $(OBJS)\anitest.lbc name $^@
+       @%append $(OBJS)\anitest.lbc option caseexact
+       @%append $(OBJS)\anitest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i
+       @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res
+       @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i
+       wlink @$(OBJS)\anitest.lbc
+
+catalog : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\anitest_anitest.obj :  .AUTODEPEND .\anitest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<
+
+$(OBJS)\anitest_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 30c1aba528a8d4302ffe8a4dbb86fc1339cf1ad2..364d944ef68542aa4d6dee3f5316344cfd21796e 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp
index 8c0a173cfdc19e72a2fdfd6afd4c7617d3ee0628..9e4f822fc643eb54146b0d2d8a413518f72bf494 100644 (file)
--- a/samples/artprov/artprov.dsp
+++ b/samples/artprov/artprov.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\arttest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\arttest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\arttest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\arttest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index ad69f21a14893513c05f7fc15a694a8a5f3bc8c7..daac2c63df0311ef7b8896a57416edb45d61a730 100644 (file)
--- a/samples/artprov/artprov_vc7.vcproj
+++ b/samples/artprov/artprov_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\arttest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\arttest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\arttest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index 408b5a2b91e7bb7f8cf37b7167b05bf57ab115d0..cf2207b880fb4003a8910ba2dffaa474573a9872 100644 (file)
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj
index 792e38a2e977cf94224dfb4a72655151170e0e8a..156104641386cacbe7980e5aa8c280aa61c48372 100644 (file)
--- a/samples/artprov/artprov_vc9.vcproj
+++ b/samples/artprov/artprov_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\arttest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc
index 22a8ccc2b337a72a2ac57bfe117c777f71a6a5d3..c905dc3aec1e16d0d886642334405c1422a9c669 100644 (file)
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ARTTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ARTTEST_OBJECTS =  \\r
-       $(OBJS)\arttest_arttest.obj \\r
-       $(OBJS)\arttest_artbrows.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\arttest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
-       -if exist $(OBJS)\arttest.tds del $(OBJS)\arttest.tds\r
-       -if exist $(OBJS)\arttest.ilc del $(OBJS)\arttest.ilc\r
-       -if exist $(OBJS)\arttest.ild del $(OBJS)\arttest.ild\r
-       -if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf\r
-       -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils\r
-\r
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS)  $(OBJS)\arttest_arttest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_arttest.res\r
-|\r
-\r
-$(OBJS)\arttest_arttest.obj: .\arttest.cpp\r
-       $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
-\r
-$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
-       $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
-\r
-$(OBJS)\arttest_arttest.res: .\arttest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\arttest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARTTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ARTTEST_OBJECTS =  \
+       $(OBJS)\arttest_arttest.obj \
+       $(OBJS)\arttest_artbrows.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\arttest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
+       -if exist $(OBJS)\arttest.tds del $(OBJS)\arttest.tds
+       -if exist $(OBJS)\arttest.ilc del $(OBJS)\arttest.ilc
+       -if exist $(OBJS)\arttest.ild del $(OBJS)\arttest.ild
+       -if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf
+       -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils
+
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS)  $(OBJS)\arttest_arttest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_arttest.res
+|
+
+$(OBJS)\arttest_arttest.obj: .\arttest.cpp
+       $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp
+
+$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp
+       $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp
+
+$(OBJS)\arttest_arttest.res: .\arttest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\arttest.rc
+

diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index 9c593cf913a5111acbb55b514093ee1891770bb6..9622b6f321ea69eff2df853faf93e2f6bd21af1d 100644 (file)
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ARTTEST_OBJECTS =  \\r
-       $(OBJS)\arttest_arttest.o \\r
-       $(OBJS)\arttest_artbrows.o \\r
-       $(OBJS)\arttest_arttest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\arttest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
-\r
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o\r
-       $(CXX) -o $@ $(ARTTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\arttest_arttest.o: ./arttest.cpp\r
-       $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\arttest_artbrows.o: ./artbrows.cpp\r
-       $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\arttest_arttest_rc.o: ./arttest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ARTTEST_OBJECTS =  \
+       $(OBJS)\arttest_arttest.o \
+       $(OBJS)\arttest_artbrows.o \
+       $(OBJS)\arttest_arttest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\arttest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
+
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o
+       $(CXX) -o $@ $(ARTTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\arttest_arttest.o: ./arttest.cpp
+       $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\arttest_artbrows.o: ./artbrows.cpp
+       $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\arttest_arttest_rc.o: ./arttest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx
index 0065d1510ade7ffb191be717bd33dc4a02b15cf0..7989b8930b562c063bc34fc8803182b3a75a3f5f 100644 (file)
--- a/samples/artprov/makefile.unx
+++ b/samples/artprov/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index a636195dc6849959e21ffbe622b17e619b5c2994..d2902e0b48d0b93e0444032280d27ffbe1c8e568 100644 (file)
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-ARTTEST_OBJECTS =  \\r
-       $(OBJS)\arttest_arttest.obj \\r
-       $(OBJS)\arttest_artbrows.obj \\r
-       $(OBJS)\arttest_arttest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\arttest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
-       -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk\r
-       -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb\r
-\r
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ARTTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\arttest_arttest.obj: .\arttest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
-\r
-$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
-\r
-$(OBJS)\arttest_arttest.res: .\arttest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ARTTEST_OBJECTS =  \
+       $(OBJS)\arttest_arttest.obj \
+       $(OBJS)\arttest_artbrows.obj
+ARTTEST_RESOURCES =  \
+       $(OBJS)\arttest_arttest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\arttest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
+       -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk
+       -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb
+
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\arttest_arttest.obj: .\arttest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp
+
+$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp
+
+$(OBJS)\arttest_arttest.res: .\arttest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc
+

diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index 4415719b15396f509730b3b1ff89852790a83ab6..6446d932686279b57e37e99df9c464607339d12a 100644 (file)
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-ARTTEST_OBJECTS =  &\r
-       $(OBJS)\arttest_arttest.obj &\r
-       $(OBJS)\arttest_artbrows.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\arttest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
-\r
-$(OBJS)\arttest.exe :  $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res\r
-       @%create $(OBJS)\arttest.lbc\r
-       @%append $(OBJS)\arttest.lbc option quiet\r
-       @%append $(OBJS)\arttest.lbc name $^@\r
-       @%append $(OBJS)\arttest.lbc option caseexact\r
-       @%append $(OBJS)\arttest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i\r
-       @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res\r
-       @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i\r
-       wlink @$(OBJS)\arttest.lbc\r
-\r
-$(OBJS)\arttest_arttest.obj :  .AUTODEPEND .\arttest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\arttest_artbrows.obj :  .AUTODEPEND .\artbrows.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\arttest_arttest.res :  .AUTODEPEND .\arttest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+ARTTEST_OBJECTS =  &
+       $(OBJS)\arttest_arttest.obj &
+       $(OBJS)\arttest_artbrows.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\arttest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
+
+$(OBJS)\arttest.exe :  $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
+       @%create $(OBJS)\arttest.lbc
+       @%append $(OBJS)\arttest.lbc option quiet
+       @%append $(OBJS)\arttest.lbc name $^@
+       @%append $(OBJS)\arttest.lbc option caseexact
+       @%append $(OBJS)\arttest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i
+       @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res
+       @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i
+       wlink @$(OBJS)\arttest.lbc
+
+$(OBJS)\arttest_arttest.obj :  .AUTODEPEND .\arttest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<
+
+$(OBJS)\arttest_artbrows.obj :  .AUTODEPEND .\artbrows.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<
+
+$(OBJS)\arttest_arttest.res :  .AUTODEPEND .\arttest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index fab2e785c9148c42879f47514ce49b6060bcff01..0c2db839c104bcf5514e07998b3c6ca96e74edf6 100644 (file)
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/aui/auidemo.dsp b/samples/aui/auidemo.dsp
index 23136a8cc3b65c5d5fef92d5978f5ca03f330c23..80302a4d78a151093901d07098f686bb18ad1b70 100644 (file)
--- a/samples/aui/auidemo.dsp
+++ b/samples/aui/auidemo.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\auidemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\auidemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\auidemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\auidemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/aui/auidemo_vc7.vcproj b/samples/aui/auidemo_vc7.vcproj
index 41e78ad2a1615b2b3db524de745529e64246ef7b..032f7ff67d6d2068a6c6eeda7590f364adbec161 100644 (file)
--- a/samples/aui/auidemo_vc7.vcproj
+++ b/samples/aui/auidemo_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\auidemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\auidemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\auidemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/aui/auidemo_vc8.vcproj b/samples/aui/auidemo_vc8.vcproj
index e58518f957c08221056518cb024686236b98f6d4..92d43aad66b9b10d77068d44fe36852acea52982 100644 (file)
--- a/samples/aui/auidemo_vc8.vcproj
+++ b/samples/aui/auidemo_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/aui/auidemo_vc9.vcproj b/samples/aui/auidemo_vc9.vcproj
index c7e27c6401a62144a4d542db246dfaafcf7ebb44..4e0d3770abc51135373742c4ad1a94fda059063b 100644 (file)
--- a/samples/aui/auidemo_vc9.vcproj
+++ b/samples/aui/auidemo_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\auidemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc
index 493bc407dc23d1eed02256c18b736ffcf65baa35..26f156f70c02fcf96393ec8e47e029f0cd3bf9b3 100644 (file)
--- a/samples/aui/makefile.bcc
+++ b/samples/aui/makefile.bcc
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-AUIDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-AUIDEMO_OBJECTS =  \\r
-       $(OBJS)\auidemo_auidemo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_AUI_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\auidemo.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe\r
-       -if exist $(OBJS)\auidemo.tds del $(OBJS)\auidemo.tds\r
-       -if exist $(OBJS)\auidemo.ilc del $(OBJS)\auidemo.ilc\r
-       -if exist $(OBJS)\auidemo.ild del $(OBJS)\auidemo.ild\r
-       -if exist $(OBJS)\auidemo.ilf del $(OBJS)\auidemo.ilf\r
-       -if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils\r
-\r
-$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS)  $(OBJS)\auidemo_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res\r
-|\r
-\r
-$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp\r
-       $(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS =  \
+       $(OBJS)\auidemo_auidemo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+       -if exist $(OBJS)\auidemo.tds del $(OBJS)\auidemo.tds
+       -if exist $(OBJS)\auidemo.ilc del $(OBJS)\auidemo.ilc
+       -if exist $(OBJS)\auidemo.ild del $(OBJS)\auidemo.ild
+       -if exist $(OBJS)\auidemo.ilf del $(OBJS)\auidemo.ilf
+       -if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS)  $(OBJS)\auidemo_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
+|
+
+$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
+       $(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp
+

diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
index c8d90dff51abb2ed7d6ef0bac781b4a062a95ff4..88cdc32658b27596af3993802bc6285d4f0bf319 100644 (file)
--- a/samples/aui/makefile.gcc
+++ b/samples/aui/makefile.gcc
@@ -1,242 +1,242 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-AUIDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-AUIDEMO_OBJECTS =  \\r
-       $(OBJS)\auidemo_sample_rc.o \\r
-       $(OBJS)\auidemo_auidemo.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_AUI_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\auidemo.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe\r
-\r
-$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o\r
-       $(CXX) -o $@ $(AUIDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\auidemo_auidemo.o: ./auidemo.cpp\r
-       $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS =  \
+       $(OBJS)\auidemo_sample_rc.o \
+       $(OBJS)\auidemo_auidemo.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_AUI_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
+       $(CXX) -o $@ $(AUIDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\auidemo_auidemo.o: ./auidemo.cpp
+       $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx
index c60ea702c879ea9749ffa9046c2951db3ca2a5ba..82dd2e6d2b5e37402e62a85a3080f0921b78a0ad 100644 (file)
--- a/samples/aui/makefile.unx
+++ b/samples/aui/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
index b2c0304dd2975efee7c3f6c9cefb31140343d4da..dd05eab13c96ba99cd5a82cac8f47edcc1e703e0 100644 (file)
--- a/samples/aui/makefile.vc
+++ b/samples/aui/makefile.vc
@@ -1,327 +1,352 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-AUIDEMO_OBJECTS =  \\r
-       $(OBJS)\auidemo_sample.res \\r
-       $(OBJS)\auidemo_auidemo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_AUI_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\auidemo.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe\r
-       -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk\r
-       -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb\r
-\r
-$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(AUIDEMO_OBJECTS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS =  \
+       $(OBJS)\auidemo_auidemo.obj
+AUIDEMO_RESOURCES =  \
+       $(OBJS)\auidemo_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+       -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk
+       -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp
+

diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat
index ac7dddbd22e97daf9733e76725994a81cd1a34d7..ca51e3ba6f2ef1c055b93e3adec5b094d20e86c8 100644 (file)
--- a/samples/aui/makefile.wat
+++ b/samples/aui/makefile.wat
@@ -1,280 +1,280 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_AUI_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_AUI_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-AUIDEMO_OBJECTS =  &\r
-       $(OBJS)\auidemo_auidemo.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\auidemo.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe\r
-\r
-$(OBJS)\auidemo.exe :  $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res\r
-       @%create $(OBJS)\auidemo.lbc\r
-       @%append $(OBJS)\auidemo.lbc option quiet\r
-       @%append $(OBJS)\auidemo.lbc name $^@\r
-       @%append $(OBJS)\auidemo.lbc option caseexact\r
-       @%append $(OBJS)\auidemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i\r
-       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i\r
-       @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res\r
-       @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i\r
-       wlink @$(OBJS)\auidemo.lbc\r
-\r
-$(OBJS)\auidemo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\auidemo_auidemo.obj :  .AUTODEPEND .\auidemo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_AUI_p =
+!ifeq MONOLITHIC 0
+__WXLIB_AUI_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+AUIDEMO_OBJECTS =  &
+       $(OBJS)\auidemo_auidemo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\auidemo.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+
+$(OBJS)\auidemo.exe :  $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
+       @%create $(OBJS)\auidemo.lbc
+       @%append $(OBJS)\auidemo.lbc option quiet
+       @%append $(OBJS)\auidemo.lbc name $^@
+       @%append $(OBJS)\auidemo.lbc option caseexact
+       @%append $(OBJS)\auidemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i
+       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i
+       @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res
+       @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i
+       wlink @$(OBJS)\auidemo.lbc
+
+$(OBJS)\auidemo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\auidemo_auidemo.obj :  .AUTODEPEND .\auidemo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $<
+

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index ad7fe70e37ee32e69a12e0844ad247f64c11a5fa..55bd98c137ee734d62b78d3628b9ca5e412ccf78 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp
index 2c289e10d7fb3a935f1a599554aace201703e0f2..5e676d0cc2d53fd81f359e6e1f910f74f08d1e25 100644 (file)
--- a/samples/calendar/calendar.dsp
+++ b/samples/calendar/calendar.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\calendar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\calendar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\calendar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\calendar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj
index ef0b441b67e7b7d4468424bca9fb983084c5b086..8608012248b71deb5330b4aa05575f4f24cfd78d 100644 (file)
--- a/samples/calendar/calendar_vc7.vcproj
+++ b/samples/calendar/calendar_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\calendar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\calendar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\calendar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\calendar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj
index 34f54163538514efb2d98bbff5c5706494ff4c28..b9f68e65a19068eada60b31226322ad6ccb079af 100644 (file)
--- a/samples/calendar/calendar_vc8.vcproj
+++ b/samples/calendar/calendar_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj
index bea3aab88d61858278e52ccebd873c1154a90776..e30337ce25ea61ff4fb71c7b1fd0140e9fb890e8 100644 (file)
--- a/samples/calendar/calendar_vc9.vcproj
+++ b/samples/calendar/calendar_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\calendar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\calendar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index 510913b681e56895a6a16ff905dd0804c7d597ed..f43d055188f7d03b7775891c98c05e5e83f9795f 100644 (file)
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CALENDAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CALENDAR_OBJECTS =  \\r
-       $(OBJS)\calendar_calendar.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\calendar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
-       -if exist $(OBJS)\calendar.tds del $(OBJS)\calendar.tds\r
-       -if exist $(OBJS)\calendar.ilc del $(OBJS)\calendar.ilc\r
-       -if exist $(OBJS)\calendar.ild del $(OBJS)\calendar.ild\r
-       -if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf\r
-       -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils\r
-\r
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS)  $(OBJS)\calendar_calendar.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_calendar.res\r
-|\r
-\r
-$(OBJS)\calendar_calendar.obj: .\calendar.cpp\r
-       $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
-\r
-$(OBJS)\calendar_calendar.res: .\calendar.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\calendar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CALENDAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CALENDAR_OBJECTS =  \
+       $(OBJS)\calendar_calendar.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\calendar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
+       -if exist $(OBJS)\calendar.tds del $(OBJS)\calendar.tds
+       -if exist $(OBJS)\calendar.ilc del $(OBJS)\calendar.ilc
+       -if exist $(OBJS)\calendar.ild del $(OBJS)\calendar.ild
+       -if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf
+       -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils
+
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS)  $(OBJS)\calendar_calendar.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_calendar.res
+|
+
+$(OBJS)\calendar_calendar.obj: .\calendar.cpp
+       $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp
+
+$(OBJS)\calendar_calendar.res: .\calendar.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\calendar.rc
+

diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 08647c1643bcee517506baa015404f5d8f3b9bde..74374159135cf253637a0e3a948d48025e589440 100644 (file)
--- a/samples/calendar/makefile.gcc
+++ b/samples/calendar/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CALENDAR_OBJECTS =  \\r
-       $(OBJS)\calendar_calendar.o \\r
-       $(OBJS)\calendar_calendar_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\calendar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
-\r
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o\r
-       $(CXX) -o $@ $(CALENDAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\calendar_calendar.o: ./calendar.cpp\r
-       $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\calendar_calendar_rc.o: ./calendar.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CALENDAR_OBJECTS =  \
+       $(OBJS)\calendar_calendar.o \
+       $(OBJS)\calendar_calendar_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\calendar.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
+
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o
+       $(CXX) -o $@ $(CALENDAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\calendar_calendar.o: ./calendar.cpp
+       $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\calendar_calendar_rc.o: ./calendar.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx
index e146c5dc5cf0f16e6ff3cebb0de2a89e0e235840..498d3b37cd1ac5b1374b46c8e1664506efa52a1d 100644 (file)
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 2ebfb18acfa30854ae5491620991a2459db71370..8a14e75e11c73ceb9f24614e1f2c35582c0f3aad 100644 (file)
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-CALENDAR_OBJECTS =  \\r
-       $(OBJS)\calendar_calendar.obj \\r
-       $(OBJS)\calendar_calendar.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\calendar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
-       -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk\r
-       -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb\r
-\r
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CALENDAR_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\calendar_calendar.obj: .\calendar.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
-\r
-$(OBJS)\calendar_calendar.res: .\calendar.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CALENDAR_OBJECTS =  \
+       $(OBJS)\calendar_calendar.obj
+CALENDAR_RESOURCES =  \
+       $(OBJS)\calendar_calendar.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\calendar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
+       -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk
+       -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb
+
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\calendar_calendar.obj: .\calendar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp
+
+$(OBJS)\calendar_calendar.res: .\calendar.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc
+

diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index b35bb0b4d18ed59513ffc097cb02a409bf385fdc..d12e37d62b4c4a413967e9f348927318240429c8 100644 (file)
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CALENDAR_OBJECTS =  &\r
-       $(OBJS)\calendar_calendar.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\calendar.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
-\r
-$(OBJS)\calendar.exe :  $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res\r
-       @%create $(OBJS)\calendar.lbc\r
-       @%append $(OBJS)\calendar.lbc option quiet\r
-       @%append $(OBJS)\calendar.lbc name $^@\r
-       @%append $(OBJS)\calendar.lbc option caseexact\r
-       @%append $(OBJS)\calendar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i\r
-       @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res\r
-       @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i\r
-       wlink @$(OBJS)\calendar.lbc\r
-\r
-$(OBJS)\calendar_calendar.obj :  .AUTODEPEND .\calendar.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<\r
-\r
-$(OBJS)\calendar_calendar.res :  .AUTODEPEND .\calendar.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CALENDAR_OBJECTS =  &
+       $(OBJS)\calendar_calendar.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\calendar.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
+
+$(OBJS)\calendar.exe :  $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
+       @%create $(OBJS)\calendar.lbc
+       @%append $(OBJS)\calendar.lbc option quiet
+       @%append $(OBJS)\calendar.lbc name $^@
+       @%append $(OBJS)\calendar.lbc option caseexact
+       @%append $(OBJS)\calendar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i
+       @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res
+       @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i
+       wlink @$(OBJS)\calendar.lbc
+
+$(OBJS)\calendar_calendar.obj :  .AUTODEPEND .\calendar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<
+
+$(OBJS)\calendar_calendar.res :  .AUTODEPEND .\calendar.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 0f722cf94a12d9cea4fed3f164cd1c8ec433ee6a..408aa2a9d3c7e5e331e8cee8a3ce74729fdc6231 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp
index c14d370951288ba4905ae0c429dab90629866d1b..8e092f19135075ae673ed22aec1429330fef3456 100644 (file)
--- a/samples/caret/caret.dsp
+++ b/samples/caret/caret.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\caret"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\caret"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\caret"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\caret"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj
index cc542867aeccee09a25ed5e71bb41746db7150a6..f0a66908ada348c3383fb6755e10ab7c0183cf97 100644 (file)
--- a/samples/caret/caret_vc7.vcproj
+++ b/samples/caret/caret_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\caret.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\caret.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\caret.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\caret.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj
index 6be74aa18e5881916c6ed10a15f7acfcc39bde57..ad2911d6795a0e4653c01c0c7589d9c229ff1be1 100644 (file)
--- a/samples/caret/caret_vc8.vcproj
+++ b/samples/caret/caret_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj
index f36ebd2eddbb07b6f601d749174433fd38ae21ca..6de4a0d72746f9a8d2dd7a559a1a2a37f2713b8b 100644 (file)
--- a/samples/caret/caret_vc9.vcproj
+++ b/samples/caret/caret_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\caret.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\caret.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index 09f50c43cf29de5a104cde53ed2ba90ef0740abc..dd5bedee968b4177fe89ff9ea0266daf41cc7419 100644 (file)
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CARET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CARET_OBJECTS =  \\r
-       $(OBJS)\caret_caret.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\caret.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
-       -if exist $(OBJS)\caret.tds del $(OBJS)\caret.tds\r
-       -if exist $(OBJS)\caret.ilc del $(OBJS)\caret.ilc\r
-       -if exist $(OBJS)\caret.ild del $(OBJS)\caret.ild\r
-       -if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf\r
-       -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils\r
-\r
-$(OBJS)\caret.exe: $(CARET_OBJECTS)  $(OBJS)\caret_caret.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_caret.res\r
-|\r
-\r
-$(OBJS)\caret_caret.obj: .\caret.cpp\r
-       $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp\r
-\r
-$(OBJS)\caret_caret.res: .\caret.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\caret.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CARET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CARET_OBJECTS =  \
+       $(OBJS)\caret_caret.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\caret.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
+       -if exist $(OBJS)\caret.tds del $(OBJS)\caret.tds
+       -if exist $(OBJS)\caret.ilc del $(OBJS)\caret.ilc
+       -if exist $(OBJS)\caret.ild del $(OBJS)\caret.ild
+       -if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf
+       -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils
+
+$(OBJS)\caret.exe: $(CARET_OBJECTS)  $(OBJS)\caret_caret.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_caret.res
+|
+
+$(OBJS)\caret_caret.obj: .\caret.cpp
+       $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp
+
+$(OBJS)\caret_caret.res: .\caret.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\caret.rc
+

diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index 4775b5fc2ac666a7f8d6b1a1854bf66ea5a4c536..4543c5d2e58156b501d02b145f24c0453dd24c8f 100644 (file)
--- a/samples/caret/makefile.gcc
+++ b/samples/caret/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CARET_OBJECTS =  \\r
-       $(OBJS)\caret_caret.o \\r
-       $(OBJS)\caret_caret_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\caret.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
-\r
-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o\r
-       $(CXX) -o $@ $(CARET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\caret_caret.o: ./caret.cpp\r
-       $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\caret_caret_rc.o: ./caret.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CARET_OBJECTS =  \
+       $(OBJS)\caret_caret.o \
+       $(OBJS)\caret_caret_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\caret.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
+
+$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o
+       $(CXX) -o $@ $(CARET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\caret_caret.o: ./caret.cpp
+       $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\caret_caret_rc.o: ./caret.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
index d3310228e34d9e5aa2da434d071249394ee891ca..736e57ab681e8868794108e3ba40a019e18c61f1 100644 (file)
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index 37892806dddc3a827b7cc6ec69af8859181e6d67..e5b056ac6fed6e5a7bd1ba95fc47fbb9996448d6 100644 (file)
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-CARET_OBJECTS =  \\r
-       $(OBJS)\caret_caret.obj \\r
-       $(OBJS)\caret_caret.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\caret.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
-       -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk\r
-       -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb\r
-\r
-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CARET_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\caret_caret.obj: .\caret.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp\r
-\r
-$(OBJS)\caret_caret.res: .\caret.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CARET_OBJECTS =  \
+       $(OBJS)\caret_caret.obj
+CARET_RESOURCES =  \
+       $(OBJS)\caret_caret.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\caret.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
+       -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk
+       -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb
+
+$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CARET_OBJECTS) $(CARET_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\caret_caret.obj: .\caret.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp
+
+$(OBJS)\caret_caret.res: .\caret.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc
+

diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index ab1c7b3864e21ed162c00d355132456c68563cd8..e1dc30f1f9871fd58a7c5641efe5c99ffe916710 100644 (file)
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CARET_OBJECTS =  &\r
-       $(OBJS)\caret_caret.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\caret.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
-\r
-$(OBJS)\caret.exe :  $(CARET_OBJECTS) $(OBJS)\caret_caret.res\r
-       @%create $(OBJS)\caret.lbc\r
-       @%append $(OBJS)\caret.lbc option quiet\r
-       @%append $(OBJS)\caret.lbc name $^@\r
-       @%append $(OBJS)\caret.lbc option caseexact\r
-       @%append $(OBJS)\caret.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i\r
-       @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res\r
-       @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i\r
-       wlink @$(OBJS)\caret.lbc\r
-\r
-$(OBJS)\caret_caret.obj :  .AUTODEPEND .\caret.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<\r
-\r
-$(OBJS)\caret_caret.res :  .AUTODEPEND .\caret.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CARET_OBJECTS =  &
+       $(OBJS)\caret_caret.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\caret.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
+
+$(OBJS)\caret.exe :  $(CARET_OBJECTS) $(OBJS)\caret_caret.res
+       @%create $(OBJS)\caret.lbc
+       @%append $(OBJS)\caret.lbc option quiet
+       @%append $(OBJS)\caret.lbc name $^@
+       @%append $(OBJS)\caret.lbc option caseexact
+       @%append $(OBJS)\caret.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i
+       @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res
+       @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i
+       wlink @$(OBJS)\caret.lbc
+
+$(OBJS)\caret_caret.obj :  .AUTODEPEND .\caret.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<
+
+$(OBJS)\caret_caret.res :  .AUTODEPEND .\caret.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index ae523f0211969e5e6ac2476c00dd6d867edb7e87..564248d1a2a9a55ae2409e37f14a0cdadc325bfe 100644 (file)
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/clipboard/clipboard.dsp b/samples/clipboard/clipboard.dsp
index 0073ee59dc23cf4f83e8813603d9aaca2e3235ce..18f764dac25c363423b3979432c5166b3a1973e2 100644 (file)
--- a/samples/clipboard/clipboard.dsp
+++ b/samples/clipboard/clipboard.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\clipboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\clipboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\clipboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\clipboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj
index 2ca8596582f5bccb0bbd0fa1063fc8defec9c434..729d59093b94b89a2d0f73f12874f521dc8443a5 100644 (file)
--- a/samples/clipboard/clipboard_vc7.vcproj
+++ b/samples/clipboard/clipboard_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\clipboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\clipboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\clipboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\clipboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj
index dcb6721dd0bd845f9bde6efab29dd457d3cc0704..20ada4f8ff9e4c068ed15d34e9d5b7c3a026fedb 100644 (file)
--- a/samples/clipboard/clipboard_vc8.vcproj
+++ b/samples/clipboard/clipboard_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj
index 45975fe588c3cb084bf304a7b04254145089feb3..ea0ddee58d0415d7d2e84758453b15c5adae5acf 100644 (file)
--- a/samples/clipboard/clipboard_vc9.vcproj
+++ b/samples/clipboard/clipboard_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\clipboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\clipboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc
index ce5920be9bd2789871d9bf54f525f2c7b8361fe4..41813cab01241bd0de62e26f6e0fce3970ba8bd7 100644 (file)
--- a/samples/clipboard/makefile.bcc
+++ b/samples/clipboard/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIPBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CLIPBOARD_OBJECTS =  \\r
-       $(OBJS)\clipboard_clipboard.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\clipboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
-       -if exist $(OBJS)\clipboard.tds del $(OBJS)\clipboard.tds\r
-       -if exist $(OBJS)\clipboard.ilc del $(OBJS)\clipboard.ilc\r
-       -if exist $(OBJS)\clipboard.ild del $(OBJS)\clipboard.ild\r
-       -if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf\r
-       -if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils\r
-\r
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS)  $(OBJS)\clipboard_clipboard.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_clipboard.res\r
-|\r
-\r
-$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp\r
-       $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
-\r
-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\clipboard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIPBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CLIPBOARD_OBJECTS =  \
+       $(OBJS)\clipboard_clipboard.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\clipboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
+       -if exist $(OBJS)\clipboard.tds del $(OBJS)\clipboard.tds
+       -if exist $(OBJS)\clipboard.ilc del $(OBJS)\clipboard.ilc
+       -if exist $(OBJS)\clipboard.ild del $(OBJS)\clipboard.ild
+       -if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf
+       -if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils
+
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS)  $(OBJS)\clipboard_clipboard.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_clipboard.res
+|
+
+$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp
+       $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp
+
+$(OBJS)\clipboard_clipboard.res: .\clipboard.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\clipboard.rc
+

diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index 38b8659aa6bce50a2cc7b94684736b1dc8a4441c..b1f5c94d4e2054756f37733855eca069b2dd9e80 100644 (file)
--- a/samples/clipboard/makefile.gcc
+++ b/samples/clipboard/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CLIPBOARD_OBJECTS =  \\r
-       $(OBJS)\clipboard_clipboard.o \\r
-       $(OBJS)\clipboard_clipboard_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\clipboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
-\r
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard_rc.o\r
-       $(CXX) -o $@ $(CLIPBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\clipboard_clipboard.o: ./clipboard.cpp\r
-       $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\clipboard_clipboard_rc.o: ./clipboard.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CLIPBOARD_OBJECTS =  \
+       $(OBJS)\clipboard_clipboard.o \
+       $(OBJS)\clipboard_clipboard_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\clipboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
+
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard_rc.o
+       $(CXX) -o $@ $(CLIPBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\clipboard_clipboard.o: ./clipboard.cpp
+       $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\clipboard_clipboard_rc.o: ./clipboard.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/clipboard/makefile.unx b/samples/clipboard/makefile.unx
index 174c0e55b4cf9d6e8bca02a0a1056090849ab99e..ddaa00c81ee1b4f8b710377bd9e20ece4cd04d11 100644 (file)
--- a/samples/clipboard/makefile.unx
+++ b/samples/clipboard/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index 05c762a4e731b033c2322eb9303fed825ee80cfe..4f53b7389dd00a15a11ce7e2a77fdcaeaf8e464a 100644 (file)
--- a/samples/clipboard/makefile.vc
+++ b/samples/clipboard/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-CLIPBOARD_OBJECTS =  \\r
-       $(OBJS)\clipboard_clipboard.obj \\r
-       $(OBJS)\clipboard_clipboard.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\clipboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
-       -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk\r
-       -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb\r
-\r
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CLIPBOARD_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
-\r
-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CLIPBOARD_OBJECTS =  \
+       $(OBJS)\clipboard_clipboard.obj
+CLIPBOARD_RESOURCES =  \
+       $(OBJS)\clipboard_clipboard.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\clipboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
+       -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk
+       -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb
+
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp
+
+$(OBJS)\clipboard_clipboard.res: .\clipboard.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc
+

diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat
index 075e2c6978542a48b7815945f64a62209069c2b8..f6e4bb1b13c4d53d802b9226435c53f48c57606e 100644 (file)
--- a/samples/clipboard/makefile.wat
+++ b/samples/clipboard/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CLIPBOARD_OBJECTS =  &\r
-       $(OBJS)\clipboard_clipboard.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\clipboard.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
-\r
-$(OBJS)\clipboard.exe :  $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res\r
-       @%create $(OBJS)\clipboard.lbc\r
-       @%append $(OBJS)\clipboard.lbc option quiet\r
-       @%append $(OBJS)\clipboard.lbc name $^@\r
-       @%append $(OBJS)\clipboard.lbc option caseexact\r
-       @%append $(OBJS)\clipboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i\r
-       @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res\r
-       @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i\r
-       wlink @$(OBJS)\clipboard.lbc\r
-\r
-$(OBJS)\clipboard_clipboard.obj :  .AUTODEPEND .\clipboard.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<\r
-\r
-$(OBJS)\clipboard_clipboard.res :  .AUTODEPEND .\clipboard.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CLIPBOARD_OBJECTS =  &
+       $(OBJS)\clipboard_clipboard.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\clipboard.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
+
+$(OBJS)\clipboard.exe :  $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
+       @%create $(OBJS)\clipboard.lbc
+       @%append $(OBJS)\clipboard.lbc option quiet
+       @%append $(OBJS)\clipboard.lbc name $^@
+       @%append $(OBJS)\clipboard.lbc option caseexact
+       @%append $(OBJS)\clipboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i
+       @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res
+       @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i
+       wlink @$(OBJS)\clipboard.lbc
+
+$(OBJS)\clipboard_clipboard.obj :  .AUTODEPEND .\clipboard.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<
+
+$(OBJS)\clipboard_clipboard.res :  .AUTODEPEND .\clipboard.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index bac9bf2b71473983ad0514e412bebbd8e858e318..d4c08f0922a1e0e8068f903cbbfb6ec79db39dde 100644 (file)
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/collpane/collpane.dsp b/samples/collpane/collpane.dsp
index 138aba064513466b2dc6858c02c98f42fe5bc420..ccc8315db03187bb2611e2d91e3ea72d2ff4df83 100644 (file)
--- a/samples/collpane/collpane.dsp
+++ b/samples/collpane/collpane.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\collpane"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\collpane"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\collpane"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\collpane"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/collpane/collpane_vc7.vcproj b/samples/collpane/collpane_vc7.vcproj
index 77c7f49d8f3593722194b981b0db50bdea8b2a70..42bf1463f7f62b37cfc995142c68426699fa4adb 100644 (file)
--- a/samples/collpane/collpane_vc7.vcproj
+++ b/samples/collpane/collpane_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\collpane.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\collpane.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\collpane.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\collpane.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/collpane/collpane_vc8.vcproj b/samples/collpane/collpane_vc8.vcproj
index 2d518b098f8f1d32b77e88b76305be0f6f3aedb7..b993ebcecf2636692e9558aa714433bd614fc0e6 100644 (file)
--- a/samples/collpane/collpane_vc8.vcproj
+++ b/samples/collpane/collpane_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/collpane/collpane_vc9.vcproj b/samples/collpane/collpane_vc9.vcproj
index 6d4d39dc659c50bc130436da86cae9a78ceff991..7ee455c4867d279ac269d31bd510fb386e4a5eae 100644 (file)
--- a/samples/collpane/collpane_vc9.vcproj
+++ b/samples/collpane/collpane_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\collpane.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\collpane.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc
index 07726a803214d2e9c1624969fd7fde9b17f43d8e..121b5eda3a0930ee3262ecf8e3fe7c9d3b4e1333 100644 (file)
--- a/samples/collpane/makefile.bcc
+++ b/samples/collpane/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COLLPANE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-COLLPANE_OBJECTS =  \\r
-       $(OBJS)\collpane_collpane.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\collpane.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe\r
-       -if exist $(OBJS)\collpane.tds del $(OBJS)\collpane.tds\r
-       -if exist $(OBJS)\collpane.ilc del $(OBJS)\collpane.ilc\r
-       -if exist $(OBJS)\collpane.ild del $(OBJS)\collpane.ild\r
-       -if exist $(OBJS)\collpane.ilf del $(OBJS)\collpane.ilf\r
-       -if exist $(OBJS)\collpane.ils del $(OBJS)\collpane.ils\r
-\r
-$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS)  $(OBJS)\collpane_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res\r
-|\r
-\r
-$(OBJS)\collpane_collpane.obj: .\collpane.cpp\r
-       $(CXX) -q -c -P -o$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp\r
-\r
-$(OBJS)\collpane_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COLLPANE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+COLLPANE_OBJECTS =  \
+       $(OBJS)\collpane_collpane.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\collpane.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
+       -if exist $(OBJS)\collpane.tds del $(OBJS)\collpane.tds
+       -if exist $(OBJS)\collpane.ilc del $(OBJS)\collpane.ilc
+       -if exist $(OBJS)\collpane.ild del $(OBJS)\collpane.ild
+       -if exist $(OBJS)\collpane.ilf del $(OBJS)\collpane.ilf
+       -if exist $(OBJS)\collpane.ils del $(OBJS)\collpane.ils
+
+$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS)  $(OBJS)\collpane_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res
+|
+
+$(OBJS)\collpane_collpane.obj: .\collpane.cpp
+       $(CXX) -q -c -P -o$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp
+
+$(OBJS)\collpane_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc
index b071ffa1dea2b01984013888072bffc799adb68e..67164e2dd90c0631c8217dd6a396a9063fac9836 100644 (file)
--- a/samples/collpane/makefile.gcc
+++ b/samples/collpane/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COLLPANE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-COLLPANE_OBJECTS =  \\r
-       $(OBJS)\collpane_collpane.o \\r
-       $(OBJS)\collpane_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\collpane.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe\r
-\r
-$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o\r
-       $(CXX) -o $@ $(COLLPANE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\collpane_collpane.o: ./collpane.cpp\r
-       $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\collpane_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COLLPANE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+COLLPANE_OBJECTS =  \
+       $(OBJS)\collpane_collpane.o \
+       $(OBJS)\collpane_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\collpane.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
+
+$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o
+       $(CXX) -o $@ $(COLLPANE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\collpane_collpane.o: ./collpane.cpp
+       $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\collpane_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx
index 7f69f363ed413c7f098a13e347aa32754830388c..f0cf2e18d2341d78ad373edd96e4488cd66adbc7 100644 (file)
--- a/samples/collpane/makefile.unx
+++ b/samples/collpane/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc
index b2f23f39250d26cf6391445d0047869fb1b0ce68..5ad49399721a9895d8ec8d82e163028261077079 100644 (file)
--- a/samples/collpane/makefile.vc
+++ b/samples/collpane/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-COLLPANE_OBJECTS =  \\r
-       $(OBJS)\collpane_collpane.obj \\r
-       $(OBJS)\collpane_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\collpane.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe\r
-       -if exist $(OBJS)\collpane.ilk del $(OBJS)\collpane.ilk\r
-       -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb\r
-\r
-$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(COLLPANE_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\collpane_collpane.obj: .\collpane.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp\r
-\r
-$(OBJS)\collpane_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+COLLPANE_OBJECTS =  \
+       $(OBJS)\collpane_collpane.obj
+COLLPANE_RESOURCES =  \
+       $(OBJS)\collpane_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\collpane.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
+       -if exist $(OBJS)\collpane.ilk del $(OBJS)\collpane.ilk
+       -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb
+
+$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\collpane_collpane.obj: .\collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp
+
+$(OBJS)\collpane_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat
index 9159afc51476aa2e11c0546f8cfa93ed2fee6416..7a74c93bee5c121d0d85fbc0d683dffd30b1d16e 100644 (file)
--- a/samples/collpane/makefile.wat
+++ b/samples/collpane/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-COLLPANE_OBJECTS =  &\r
-       $(OBJS)\collpane_collpane.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\collpane.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe\r
-\r
-$(OBJS)\collpane.exe :  $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res\r
-       @%create $(OBJS)\collpane.lbc\r
-       @%append $(OBJS)\collpane.lbc option quiet\r
-       @%append $(OBJS)\collpane.lbc name $^@\r
-       @%append $(OBJS)\collpane.lbc option caseexact\r
-       @%append $(OBJS)\collpane.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i\r
-       @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res\r
-       @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i\r
-       wlink @$(OBJS)\collpane.lbc\r
-\r
-$(OBJS)\collpane_collpane.obj :  .AUTODEPEND .\collpane.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $<\r
-\r
-$(OBJS)\collpane_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+COLLPANE_OBJECTS =  &
+       $(OBJS)\collpane_collpane.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\collpane.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
+
+$(OBJS)\collpane.exe :  $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
+       @%create $(OBJS)\collpane.lbc
+       @%append $(OBJS)\collpane.lbc option quiet
+       @%append $(OBJS)\collpane.lbc name $^@
+       @%append $(OBJS)\collpane.lbc option caseexact
+       @%append $(OBJS)\collpane.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i
+       @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res
+       @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i
+       wlink @$(OBJS)\collpane.lbc
+
+$(OBJS)\collpane_collpane.obj :  .AUTODEPEND .\collpane.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $<
+
+$(OBJS)\collpane_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 2261788326d39d8d7424f7001d657d4c61d5e81e..ea355c98d0b71ade7e5a5b16a440015c7371b4f2 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/combo/combo.dsp b/samples/combo/combo.dsp
index d2d276652b11af18cef3c75c17e1ca1ff66bfa74..e5532e5e1131ac39bdf4b1069b68daa3f76c173d 100644 (file)
--- a/samples/combo/combo.dsp
+++ b/samples/combo/combo.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\combo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\combo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\combo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\combo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/combo/combo_vc7.vcproj b/samples/combo/combo_vc7.vcproj
index 5ff053e17791920d2828be05acfa0a96e789eaed..b685f1e90652e1c1d529ad16bce6251e8b057808 100644 (file)
--- a/samples/combo/combo_vc7.vcproj
+++ b/samples/combo/combo_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\combo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\combo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\combo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\combo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/combo/combo_vc8.vcproj b/samples/combo/combo_vc8.vcproj
index 9aeb7551796259618904094846f340b4bae05edc..fccedb120492080becf3e27355a15639c2c194c3 100644 (file)
--- a/samples/combo/combo_vc8.vcproj
+++ b/samples/combo/combo_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/combo/combo_vc9.vcproj b/samples/combo/combo_vc9.vcproj
index bae5b3265f5beef3c17a6ec4a035d192a3be20ec..ae86ba22bb53e3905f228bb09d4ed91bfd5b88e1 100644 (file)
--- a/samples/combo/combo_vc9.vcproj
+++ b/samples/combo/combo_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\combo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\combo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc
index 4c1ffbded39ce882af445ec58f0844334bb41548..a7c15c52249b14ba462ca2daa8b5614fe0b2ef75 100644 (file)
--- a/samples/combo/makefile.bcc
+++ b/samples/combo/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COMBO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-COMBO_OBJECTS =  \\r
-       $(OBJS)\combo_combo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\combo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe\r
-       -if exist $(OBJS)\combo.tds del $(OBJS)\combo.tds\r
-       -if exist $(OBJS)\combo.ilc del $(OBJS)\combo.ilc\r
-       -if exist $(OBJS)\combo.ild del $(OBJS)\combo.ild\r
-       -if exist $(OBJS)\combo.ilf del $(OBJS)\combo.ilf\r
-       -if exist $(OBJS)\combo.ils del $(OBJS)\combo.ils\r
-\r
-$(OBJS)\combo.exe: $(COMBO_OBJECTS)  $(OBJS)\combo_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\combo_combo.obj: .\combo.cpp\r
-       $(CXX) -q -c -P -o$@ $(COMBO_CXXFLAGS) .\combo.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COMBO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+COMBO_OBJECTS =  \
+       $(OBJS)\combo_combo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\combo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
+       -if exist $(OBJS)\combo.tds del $(OBJS)\combo.tds
+       -if exist $(OBJS)\combo.ilc del $(OBJS)\combo.ilc
+       -if exist $(OBJS)\combo.ild del $(OBJS)\combo.ild
+       -if exist $(OBJS)\combo.ilf del $(OBJS)\combo.ilf
+       -if exist $(OBJS)\combo.ils del $(OBJS)\combo.ils
+
+$(OBJS)\combo.exe: $(COMBO_OBJECTS)  $(OBJS)\combo_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\combo_combo.obj: .\combo.cpp
+       $(CXX) -q -c -P -o$@ $(COMBO_CXXFLAGS) .\combo.cpp
+

diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index 37231d180091a04d4799fb5ceacb747f641c398d..3f7014df1bf9a6877de9e15b2bb32b988d90494f 100644 (file)
--- a/samples/combo/makefile.gcc
+++ b/samples/combo/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COMBO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-COMBO_OBJECTS =  \\r
-       $(OBJS)\combo_sample_rc.o \\r
-       $(OBJS)\combo_combo.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\combo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe\r
-\r
-$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o\r
-       $(CXX) -o $@ $(COMBO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\combo_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\combo_combo.o: ./combo.cpp\r
-       $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COMBO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+COMBO_OBJECTS =  \
+       $(OBJS)\combo_sample_rc.o \
+       $(OBJS)\combo_combo.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\combo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
+
+$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o
+       $(CXX) -o $@ $(COMBO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\combo_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\combo_combo.o: ./combo.cpp
+       $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx
index a32a91bfbf27ceaa80cc3dd83af450b5f9a1693e..c1fc5ed20fd5873688f00290c4fd573d3f2a7970 100644 (file)
--- a/samples/combo/makefile.unx
+++ b/samples/combo/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index 99e164aff64c273cd8792b45a464a8dc77db7e08..df439e92d6e555b7420a3552dc114af09373f278 100644 (file)
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-COMBO_OBJECTS =  \\r
-       $(OBJS)\combo_sample.res \\r
-       $(OBJS)\combo_combo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\combo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe\r
-       -if exist $(OBJS)\combo.ilk del $(OBJS)\combo.ilk\r
-       -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb\r
-\r
-$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(COMBO_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\combo_combo.obj: .\combo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+COMBO_OBJECTS =  \
+       $(OBJS)\combo_combo.obj
+COMBO_RESOURCES =  \
+       $(OBJS)\combo_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\combo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
+       -if exist $(OBJS)\combo.ilk del $(OBJS)\combo.ilk
+       -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb
+
+$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(COMBO_OBJECTS) $(COMBO_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\combo_combo.obj: .\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp
+

diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat
index 0bce691605751f50d635bd8a898b6f0257c024e4..d3f5857bd35ded928a13d2e7b74e19b87631acb6 100644 (file)
--- a/samples/combo/makefile.wat
+++ b/samples/combo/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-COMBO_OBJECTS =  &\r
-       $(OBJS)\combo_combo.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\combo.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe\r
-\r
-$(OBJS)\combo.exe :  $(COMBO_OBJECTS) $(OBJS)\combo_sample.res\r
-       @%create $(OBJS)\combo.lbc\r
-       @%append $(OBJS)\combo.lbc option quiet\r
-       @%append $(OBJS)\combo.lbc name $^@\r
-       @%append $(OBJS)\combo.lbc option caseexact\r
-       @%append $(OBJS)\combo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i\r
-       @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res\r
-       @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i\r
-       wlink @$(OBJS)\combo.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\combo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\combo_combo.obj :  .AUTODEPEND .\combo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+COMBO_OBJECTS =  &
+       $(OBJS)\combo_combo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\combo.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
+
+$(OBJS)\combo.exe :  $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
+       @%create $(OBJS)\combo.lbc
+       @%append $(OBJS)\combo.lbc option quiet
+       @%append $(OBJS)\combo.lbc name $^@
+       @%append $(OBJS)\combo.lbc option caseexact
+       @%append $(OBJS)\combo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i
+       @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res
+       @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i
+       wlink @$(OBJS)\combo.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\combo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\combo_combo.obj :  .AUTODEPEND .\combo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $<
+

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 9e465d6763124918d0c67d6af3f8b600b0495b45..a446ced98c0653663322270e32014d0dac605d3f 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/config/config.dsp b/samples/config/config.dsp
index ad48f47d2c490b9f3daa8ab2fb6c37d8cb8d30bd..a74ee79f31d60ce6b0170d798d39ab82677c4c6d 100644 (file)
--- a/samples/config/config.dsp
+++ b/samples/config/config.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\conftest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\conftest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\conftest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\conftest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj
index 685d88d812113eea9a61056dcf63e6d3ba040bfe..f5e3fe1c7a43033a06778050f47ef253c7d43a9b 100644 (file)
--- a/samples/config/config_vc7.vcproj
+++ b/samples/config/config_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\conftest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\conftest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\conftest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj
index 344619a40aa4a63933ae091a2b9e666cd1066a4c..0d892a883086bb60a6d6ffb04a729822c58a8c33 100644 (file)
--- a/samples/config/config_vc8.vcproj
+++ b/samples/config/config_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj
index 5a4cf825e6f770ff9bbf19715361b67938363a25..2f8f1dc19ba015d3c12677c0bc67d6e94bf8ea16 100644 (file)
--- a/samples/config/config_vc9.vcproj
+++ b/samples/config/config_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\conftest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc
index 4102f0ade2a5a3e18cdfd3e236ff8d651e7eb12f..fef973f6f6d186c7212edc871a0d462274f50eb0 100644 (file)
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONFTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CONFTEST_OBJECTS =  \\r
-       $(OBJS)\conftest_conftest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\conftest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
-       -if exist $(OBJS)\conftest.tds del $(OBJS)\conftest.tds\r
-       -if exist $(OBJS)\conftest.ilc del $(OBJS)\conftest.ilc\r
-       -if exist $(OBJS)\conftest.ild del $(OBJS)\conftest.ild\r
-       -if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf\r
-       -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils\r
-\r
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS)  $(OBJS)\conftest_conftest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_conftest.res\r
-|\r
-\r
-$(OBJS)\conftest_conftest.obj: .\conftest.cpp\r
-       $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
-\r
-$(OBJS)\conftest_conftest.res: .\conftest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\conftest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONFTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CONFTEST_OBJECTS =  \
+       $(OBJS)\conftest_conftest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\conftest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
+       -if exist $(OBJS)\conftest.tds del $(OBJS)\conftest.tds
+       -if exist $(OBJS)\conftest.ilc del $(OBJS)\conftest.ilc
+       -if exist $(OBJS)\conftest.ild del $(OBJS)\conftest.ild
+       -if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf
+       -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils
+
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS)  $(OBJS)\conftest_conftest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_conftest.res
+|
+
+$(OBJS)\conftest_conftest.obj: .\conftest.cpp
+       $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp
+
+$(OBJS)\conftest_conftest.res: .\conftest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\conftest.rc
+

diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 2cb4b16fea0ad28daaa7cbd76af334d2c2603924..a6b7077f5f0b21a0382135f0d52da2e569df0991 100644 (file)
--- a/samples/config/makefile.gcc
+++ b/samples/config/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CONFTEST_OBJECTS =  \\r
-       $(OBJS)\conftest_conftest.o \\r
-       $(OBJS)\conftest_conftest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\conftest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
-\r
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o\r
-       $(CXX) -o $@ $(CONFTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\conftest_conftest.o: ./conftest.cpp\r
-       $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\conftest_conftest_rc.o: ./conftest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CONFTEST_OBJECTS =  \
+       $(OBJS)\conftest_conftest.o \
+       $(OBJS)\conftest_conftest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\conftest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
+
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o
+       $(CXX) -o $@ $(CONFTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\conftest_conftest.o: ./conftest.cpp
+       $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\conftest_conftest_rc.o: ./conftest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
index e8e26d4ca7ead6f99702264645c56d5caa80ad3a..e0de55947a28f5e8a43685969c27acf9cd7cd215 100644 (file)
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index 6ae6842631adad6fed5e7359f5ed1ceea0d4c125..4c28278ce6e5f973f633da00f913bc68a560134d 100644 (file)
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-CONFTEST_OBJECTS =  \\r
-       $(OBJS)\conftest_conftest.obj \\r
-       $(OBJS)\conftest_conftest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\conftest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
-       -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk\r
-       -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb\r
-\r
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CONFTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\conftest_conftest.obj: .\conftest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
-\r
-$(OBJS)\conftest_conftest.res: .\conftest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CONFTEST_OBJECTS =  \
+       $(OBJS)\conftest_conftest.obj
+CONFTEST_RESOURCES =  \
+       $(OBJS)\conftest_conftest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\conftest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
+       -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk
+       -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb
+
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\conftest_conftest.obj: .\conftest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp
+
+$(OBJS)\conftest_conftest.res: .\conftest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc
+

diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index f7f3c8da926607f8910a45d2aabb507ca16cf67a..0ea631ee0add7f61db599a9bc760179a42148d70 100644 (file)
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CONFTEST_OBJECTS =  &\r
-       $(OBJS)\conftest_conftest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\conftest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
-\r
-$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res\r
-       @%create $(OBJS)\conftest.lbc\r
-       @%append $(OBJS)\conftest.lbc option quiet\r
-       @%append $(OBJS)\conftest.lbc name $^@\r
-       @%append $(OBJS)\conftest.lbc option caseexact\r
-       @%append $(OBJS)\conftest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i\r
-       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res\r
-       @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i\r
-       wlink @$(OBJS)\conftest.lbc\r
-\r
-$(OBJS)\conftest_conftest.obj :  .AUTODEPEND .\conftest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\conftest_conftest.res :  .AUTODEPEND .\conftest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CONFTEST_OBJECTS =  &
+       $(OBJS)\conftest_conftest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\conftest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
+
+$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
+       @%create $(OBJS)\conftest.lbc
+       @%append $(OBJS)\conftest.lbc option quiet
+       @%append $(OBJS)\conftest.lbc name $^@
+       @%append $(OBJS)\conftest.lbc option caseexact
+       @%append $(OBJS)\conftest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i
+       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res
+       @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i
+       wlink @$(OBJS)\conftest.lbc
+
+$(OBJS)\conftest_conftest.obj :  .AUTODEPEND .\conftest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<
+
+$(OBJS)\conftest_conftest.res :  .AUTODEPEND .\conftest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 027ff3664106fe9d1207e2e585ab39ecfd19bcfa..893b4a6f468e902dbc102bd63fb0269c66601b97 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/console/console.dsp b/samples/console/console.dsp
index ff03c8c169aa0dff25ddab188bfd2dd201ec8de8..94db907193c55fd137857b1a6f34289de7bd6044 100644 (file)
--- a/samples/console/console.dsp
+++ b/samples/console/console.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\console"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\console"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\console"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\console"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/samples/console/console_vc7.vcproj b/samples/console/console_vc7.vcproj
index 50251e0b8d6d06b43468b3d5266810a27569adcc..143ab0376c821dd993dfb7c42762a600cab4e88e 100644 (file)
--- a/samples/console/console_vc7.vcproj
+++ b/samples/console/console_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\console.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\console.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\console.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\console.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/samples/console/console_vc8.vcproj b/samples/console/console_vc8.vcproj
index 5271105f09948329c08b1cbe2f8f8d26c2cb37b2..04a22ea8a6c32e09cfcf8ea8ebb732e85e1aeae6 100644 (file)
--- a/samples/console/console_vc8.vcproj
+++ b/samples/console/console_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/console/console_vc9.vcproj b/samples/console/console_vc9.vcproj
index 4e4557d30d8e0c2d5e562a82520f70b983f239c8..80fcf50860982e65cf66cc2a19889f1e10ed166e 100644 (file)
--- a/samples/console/console_vc9.vcproj
+++ b/samples/console/console_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\console.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\console.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
index 5b035633dd168039a8949dfe8b1852429cb383a7..258859b7e7637403d011c316946f6cdf2f2f36b1 100644 (file)
--- a/samples/console/makefile.bcc
+++ b/samples/console/makefile.bcc
@@ -1,194 +1,194 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-CONSOLE_OBJECTS =  \\r
-       $(OBJS)\console_console.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\console.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe\r
-       -if exist $(OBJS)\console.tds del $(OBJS)\console.tds\r
-       -if exist $(OBJS)\console.ilc del $(OBJS)\console.ilc\r
-       -if exist $(OBJS)\console.ild del $(OBJS)\console.ild\r
-       -if exist $(OBJS)\console.ilf del $(OBJS)\console.ilf\r
-       -if exist $(OBJS)\console.ils del $(OBJS)\console.ils\r
-\r
-$(OBJS)\console.exe: $(CONSOLE_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\console_console.obj: .\console.cpp\r
-       $(CXX) -q -c -P -o$@ $(CONSOLE_CXXFLAGS) .\console.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+CONSOLE_OBJECTS =  \
+       $(OBJS)\console_console.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\console.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+       -if exist $(OBJS)\console.tds del $(OBJS)\console.tds
+       -if exist $(OBJS)\console.ilc del $(OBJS)\console.ilc
+       -if exist $(OBJS)\console.ild del $(OBJS)\console.ild
+       -if exist $(OBJS)\console.ilf del $(OBJS)\console.ilf
+       -if exist $(OBJS)\console.ils del $(OBJS)\console.ils
+
+$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\console_console.obj: .\console.cpp
+       $(CXX) -q -c -P -o$@ $(CONSOLE_CXXFLAGS) .\console.cpp
+

diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc
index 99d20407f9d9aa41e53135f3d398cc7dbe138821..ddb4d11b40e78bf2f43f92ab0800ed8a28383e4e 100644 (file)
--- a/samples/console/makefile.gcc
+++ b/samples/console/makefile.gcc
@@ -1,187 +1,187 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CONSOLE_OBJECTS =  \\r
-       $(OBJS)\console_console.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\console.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe\r
-\r
-$(OBJS)\console.exe: $(CONSOLE_OBJECTS)\r
-       $(CXX) -o $@ $(CONSOLE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\console_console.o: ./console.cpp\r
-       $(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONSOLE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CONSOLE_OBJECTS =  \
+       $(OBJS)\console_console.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\console.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+
+$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\console_console.o: ./console.cpp
+       $(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx
index 5f9b2ac692f4bb07e73e33bcb305ccb5c7b92552..a65920aa03cbd8b97173395307fe2879faa7c37a 100644 (file)
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index e196c3a18a5f1ff8abc1faed1410ba7a762aae89..373af60d7d0399987a8dcda60c44c7815c93ae6a 100644 (file)
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -1,254 +1,278 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-CONSOLE_OBJECTS =  \\r
-       $(OBJS)\console_console.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\console.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe\r
-       -if exist $(OBJS)\console.ilk del $(OBJS)\console.ilk\r
-       -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb\r
-\r
-$(OBJS)\console.exe: $(CONSOLE_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(CONSOLE_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\console_console.obj: .\console.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CONSOLE_CXXFLAGS) .\console.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CONSOLE_OBJECTS =  \
+       $(OBJS)\console_console.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\console.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+       -if exist $(OBJS)\console.ilk del $(OBJS)\console.ilk
+       -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb
+
+$(OBJS)\console.exe: $(CONSOLE_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(CONSOLE_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\console_console.obj: .\console.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CONSOLE_CXXFLAGS) .\console.cpp
+

diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat
index 2cb5fcc544408f5aba60acc894d87412e84f2e1a..06f6824b07ae654ac77d968ee03442b5e4d25792 100644 (file)
--- a/samples/console/makefile.wat
+++ b/samples/console/makefile.wat
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-CONSOLE_OBJECTS =  &\r
-       $(OBJS)\console_console.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\console.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe\r
-\r
-$(OBJS)\console.exe :  $(CONSOLE_OBJECTS)\r
-       @%create $(OBJS)\console.lbc\r
-       @%append $(OBJS)\console.lbc option quiet\r
-       @%append $(OBJS)\console.lbc name $^@\r
-       @%append $(OBJS)\console.lbc option caseexact\r
-       @%append $(OBJS)\console.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\console.lbc library %i\r
-       @%append $(OBJS)\console.lbc\r
-       @for %i in () do @%append $(OBJS)\console.lbc option stack=%i\r
-       wlink @$(OBJS)\console.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\console_console.obj :  .AUTODEPEND .\console.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+CONSOLE_OBJECTS =  &
+       $(OBJS)\console_console.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\console.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+
+$(OBJS)\console.exe :  $(CONSOLE_OBJECTS)
+       @%create $(OBJS)\console.lbc
+       @%append $(OBJS)\console.lbc option quiet
+       @%append $(OBJS)\console.lbc name $^@
+       @%append $(OBJS)\console.lbc option caseexact
+       @%append $(OBJS)\console.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\console.lbc library %i
+       @%append $(OBJS)\console.lbc
+       @for %i in () do @%append $(OBJS)\console.lbc option stack=%i
+       wlink @$(OBJS)\console.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\console_console.obj :  .AUTODEPEND .\console.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $<
+

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 246a46fddbe8d3f71e43d23ba4c3b984fbef4c4c..25017d04bc777e6bdf4ede4b48271e6aa6075be0 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/controls/controls.dsp b/samples/controls/controls.dsp
index 02475cc4641b4f62d0fedf17430f8b0e2d4aee2d..13e4505ca1d62caea01d6b7458545e1cbe7c967d 100644 (file)
--- a/samples/controls/controls.dsp
+++ b/samples/controls/controls.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\controls"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\controls"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\controls"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\controls"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/controls/controls_vc7.vcproj b/samples/controls/controls_vc7.vcproj
index 6f28abbcbb92a6c18eb6fd58b8a5eefa134a1a34..0698d3544efd1cb8725901448997b10e99b1486b 100644 (file)
--- a/samples/controls/controls_vc7.vcproj
+++ b/samples/controls/controls_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\controls.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\controls.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\controls.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\controls.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/controls/controls_vc8.vcproj b/samples/controls/controls_vc8.vcproj
index 7a703b4879bd33fb699407f9c9a85d024ca98631..aa32fa40619619d9f80df65d2297c80b0b5789b0 100644 (file)
--- a/samples/controls/controls_vc8.vcproj
+++ b/samples/controls/controls_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/controls/controls_vc9.vcproj b/samples/controls/controls_vc9.vcproj
index 1741470d2f68a8e229936c6b4850b590fb0bd688..1eba0e7dd99f4111287586e61ecef977150f0ef0 100644 (file)
--- a/samples/controls/controls_vc9.vcproj
+++ b/samples/controls/controls_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\controls.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\controls.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc
index 6675d7d26f99376c346f757c92a47b379bf6fddd..e82f29a6489be31c8a5e6b992c8a376aafa1ff03 100644 (file)
--- a/samples/controls/makefile.bcc
+++ b/samples/controls/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CONTROLS_OBJECTS =  \\r
-       $(OBJS)\controls_controls.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\controls.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe\r
-       -if exist $(OBJS)\controls.tds del $(OBJS)\controls.tds\r
-       -if exist $(OBJS)\controls.ilc del $(OBJS)\controls.ilc\r
-       -if exist $(OBJS)\controls.ild del $(OBJS)\controls.ild\r
-       -if exist $(OBJS)\controls.ilf del $(OBJS)\controls.ilf\r
-       -if exist $(OBJS)\controls.ils del $(OBJS)\controls.ils\r
-\r
-$(OBJS)\controls.exe: $(CONTROLS_OBJECTS)  $(OBJS)\controls_controls.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\controls_controls.obj: .\controls.cpp\r
-       $(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) .\controls.cpp\r
-\r
-$(OBJS)\controls_controls.res: .\controls.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\controls.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CONTROLS_OBJECTS =  \
+       $(OBJS)\controls_controls.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\controls.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
+       -if exist $(OBJS)\controls.tds del $(OBJS)\controls.tds
+       -if exist $(OBJS)\controls.ilc del $(OBJS)\controls.ilc
+       -if exist $(OBJS)\controls.ild del $(OBJS)\controls.ild
+       -if exist $(OBJS)\controls.ilf del $(OBJS)\controls.ilf
+       -if exist $(OBJS)\controls.ils del $(OBJS)\controls.ils
+
+$(OBJS)\controls.exe: $(CONTROLS_OBJECTS)  $(OBJS)\controls_controls.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\controls_controls.obj: .\controls.cpp
+       $(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) .\controls.cpp
+
+$(OBJS)\controls_controls.res: .\controls.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\controls.rc
+

diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc
index 7e6474d46353c2e4ec16b06630b90362889ac7dc..e377c87975407d2f0fabc1df033eecb4b7962403 100644 (file)
--- a/samples/controls/makefile.gcc
+++ b/samples/controls/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CONTROLS_OBJECTS =  \\r
-       $(OBJS)\controls_controls.o \\r
-       $(OBJS)\controls_controls_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\controls.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe\r
-\r
-$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o\r
-       $(CXX) -o $@ $(CONTROLS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (test2.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\controls_controls.o: ./controls.cpp\r
-       $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\controls_controls_rc.o: ./controls.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CONTROLS_OBJECTS =  \
+       $(OBJS)\controls_controls.o \
+       $(OBJS)\controls_controls_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\controls.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
+
+$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o
+       $(CXX) -o $@ $(CONTROLS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (test2.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\controls_controls.o: ./controls.cpp
+       $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\controls_controls_rc.o: ./controls.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
index bc33722ca533e3b202634c3932a49968ec772521..98f42ebfc773f0713bf6c72d619571312033c506 100644 (file)
--- a/samples/controls/makefile.unx
+++ b/samples/controls/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc
index adcc4042592383a125da8c11434cc39ef5d3e37c..6546f6ef703b13fcf91566991d3ff87d7bfd5765 100644 (file)
--- a/samples/controls/makefile.vc
+++ b/samples/controls/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-CONTROLS_OBJECTS =  \\r
-       $(OBJS)\controls_controls.obj \\r
-       $(OBJS)\controls_controls.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\controls.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe\r
-       -if exist $(OBJS)\controls.ilk del $(OBJS)\controls.ilk\r
-       -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb\r
-\r
-$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CONTROLS_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\controls_controls.obj: .\controls.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp\r
-\r
-$(OBJS)\controls_controls.res: .\controls.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CONTROLS_OBJECTS =  \
+       $(OBJS)\controls_controls.obj
+CONTROLS_RESOURCES =  \
+       $(OBJS)\controls_controls.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\controls.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
+       -if exist $(OBJS)\controls.ilk del $(OBJS)\controls.ilk
+       -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb
+
+$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\controls_controls.obj: .\controls.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp
+
+$(OBJS)\controls_controls.res: .\controls.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc
+

diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat
index 2acdcea053d3fcc1a34ba0d8c2fe929c32eca316..da9d9532e0dae984b0721ba77c6a68315369b831 100644 (file)
--- a/samples/controls/makefile.wat
+++ b/samples/controls/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CONTROLS_OBJECTS =  &\r
-       $(OBJS)\controls_controls.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\controls.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe\r
-\r
-$(OBJS)\controls.exe :  $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res\r
-       @%create $(OBJS)\controls.lbc\r
-       @%append $(OBJS)\controls.lbc option quiet\r
-       @%append $(OBJS)\controls.lbc name $^@\r
-       @%append $(OBJS)\controls.lbc option caseexact\r
-       @%append $(OBJS)\controls.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %i\r
-       @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res\r
-       @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i\r
-       wlink @$(OBJS)\controls.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\controls_controls.obj :  .AUTODEPEND .\controls.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $<\r
-\r
-$(OBJS)\controls_controls.res :  .AUTODEPEND .\controls.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CONTROLS_OBJECTS =  &
+       $(OBJS)\controls_controls.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\controls.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
+
+$(OBJS)\controls.exe :  $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res
+       @%create $(OBJS)\controls.lbc
+       @%append $(OBJS)\controls.lbc option quiet
+       @%append $(OBJS)\controls.lbc name $^@
+       @%append $(OBJS)\controls.lbc option caseexact
+       @%append $(OBJS)\controls.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %i
+       @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res
+       @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i
+       wlink @$(OBJS)\controls.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\controls_controls.obj :  .AUTODEPEND .\controls.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $<
+
+$(OBJS)\controls_controls.res :  .AUTODEPEND .\controls.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index e964e605e576286c28cc9bffdfd846e223991f6e..3265c5fa2da3d03c0a09679465d334a99ea14187 100644 (file)
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dataview/dataview.dsp b/samples/dataview/dataview.dsp
index d09352a224a2d80e360051c07cf574a6e1dd40f5..b7b4a67efe866c291b7e07bf09fd5045dc5ce029 100644 (file)
--- a/samples/dataview/dataview.dsp
+++ b/samples/dataview/dataview.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\dataview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\dataview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\dataview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\dataview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj
index 03fa11f024773f83440e9224e7a93c4c3a43ccb6..bc3954e308b1e194047b19de9482b3638c7c63ac 100644 (file)
--- a/samples/dataview/dataview_vc7.vcproj
+++ b/samples/dataview/dataview_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\dataview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\dataview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\dataview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\dataview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/dataview/dataview_vc8.vcproj b/samples/dataview/dataview_vc8.vcproj
index fdf3e3ea0592325a8be313557d82c8023cb9f116..6845c50f87823d10aed0292782847713818dab20 100644 (file)
--- a/samples/dataview/dataview_vc8.vcproj
+++ b/samples/dataview/dataview_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dataview/dataview_vc9.vcproj b/samples/dataview/dataview_vc9.vcproj
index 08d3eb6f9e5e9ba1f4752390e066e7fe2c40ce7e..1978cf34a32b7735fb3b435d99f3a3267ba0cd86 100644 (file)
--- a/samples/dataview/dataview_vc9.vcproj
+++ b/samples/dataview/dataview_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dataview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dataview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc
index d68cf41636b20a77f90729da02d2843c7f33a228..eee25cedd60fb65a74e5b45273be0e99447e7cf1 100644 (file)
--- a/samples/dataview/makefile.bcc
+++ b/samples/dataview/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DATAVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DATAVIEW_OBJECTS =  \\r
-       $(OBJS)\dataview_dataview.obj \\r
-       $(OBJS)\dataview_mymodels.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dataview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe\r
-       -if exist $(OBJS)\dataview.tds del $(OBJS)\dataview.tds\r
-       -if exist $(OBJS)\dataview.ilc del $(OBJS)\dataview.ilc\r
-       -if exist $(OBJS)\dataview.ild del $(OBJS)\dataview.ild\r
-       -if exist $(OBJS)\dataview.ilf del $(OBJS)\dataview.ilf\r
-       -if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils\r
-\r
-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res\r
-|\r
-\r
-$(OBJS)\dataview_dataview.obj: .\dataview.cpp\r
-       $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp\r
-\r
-$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp\r
-       $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp\r
-\r
-$(OBJS)\dataview_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DATAVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DATAVIEW_OBJECTS =  \
+       $(OBJS)\dataview_dataview.obj \
+       $(OBJS)\dataview_mymodels.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dataview.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
+       -if exist $(OBJS)\dataview.tds del $(OBJS)\dataview.tds
+       -if exist $(OBJS)\dataview.ilc del $(OBJS)\dataview.ilc
+       -if exist $(OBJS)\dataview.ild del $(OBJS)\dataview.ild
+       -if exist $(OBJS)\dataview.ilf del $(OBJS)\dataview.ilf
+       -if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils
+
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res
+|
+
+$(OBJS)\dataview_dataview.obj: .\dataview.cpp
+       $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp
+
+$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp
+       $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp
+
+$(OBJS)\dataview_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index f9244695208a54e909f33e3c9ce2d6207e99bc9d..9ce2602bf367ffd3eaedcb537a1e892acf376916 100644 (file)
--- a/samples/dataview/makefile.gcc
+++ b/samples/dataview/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DATAVIEW_OBJECTS =  \\r
-       $(OBJS)\dataview_dataview.o \\r
-       $(OBJS)\dataview_mymodels.o \\r
-       $(OBJS)\dataview_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dataview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe\r
-\r
-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o\r
-       $(CXX) -o $@ $(DATAVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\dataview_dataview.o: ./dataview.cpp\r
-       $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dataview_mymodels.o: ./mymodels.cpp\r
-       $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dataview_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DATAVIEW_OBJECTS =  \
+       $(OBJS)\dataview_dataview.o \
+       $(OBJS)\dataview_mymodels.o \
+       $(OBJS)\dataview_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dataview.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
+
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o
+       $(CXX) -o $@ $(DATAVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\dataview_dataview.o: ./dataview.cpp
+       $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dataview_mymodels.o: ./mymodels.cpp
+       $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dataview_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx
index 4f717e4d438858058b17ff61ffd24e03a9ed9182..7428bff7c2719f9c17ab21caf74b2034a888a570 100644 (file)
--- a/samples/dataview/makefile.unx
+++ b/samples/dataview/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index 326a2d5d4f451c4669fc99aae3ec644ad5759320..1534b2a59542b7500de20f90bea64c6e4ff5afb6 100644 (file)
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DATAVIEW_OBJECTS =  \\r
-       $(OBJS)\dataview_dataview.obj \\r
-       $(OBJS)\dataview_mymodels.obj \\r
-       $(OBJS)\dataview_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dataview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe\r
-       -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk\r
-       -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb\r
-\r
-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DATAVIEW_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\dataview_dataview.obj: .\dataview.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp\r
-\r
-$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp\r
-\r
-$(OBJS)\dataview_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DATAVIEW_OBJECTS =  \
+       $(OBJS)\dataview_dataview.obj \
+       $(OBJS)\dataview_mymodels.obj
+DATAVIEW_RESOURCES =  \
+       $(OBJS)\dataview_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dataview.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
+       -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk
+       -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb
+
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\dataview_dataview.obj: .\dataview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp
+
+$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp
+
+$(OBJS)\dataview_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index f2a44ca3e0d74d563153ac63ed396b0a3b8576d1..2ce4205dfec7e8ed7964a8de5fab088d57ff7f5b 100644 (file)
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DATAVIEW_OBJECTS =  &\r
-       $(OBJS)\dataview_dataview.obj &\r
-       $(OBJS)\dataview_mymodels.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\dataview.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe\r
-\r
-$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res\r
-       @%create $(OBJS)\dataview.lbc\r
-       @%append $(OBJS)\dataview.lbc option quiet\r
-       @%append $(OBJS)\dataview.lbc name $^@\r
-       @%append $(OBJS)\dataview.lbc option caseexact\r
-       @%append $(OBJS)\dataview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i\r
-       @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res\r
-       @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i\r
-       wlink @$(OBJS)\dataview.lbc\r
-\r
-$(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\dataview_mymodels.obj :  .AUTODEPEND .\mymodels.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DATAVIEW_OBJECTS =  &
+       $(OBJS)\dataview_dataview.obj &
+       $(OBJS)\dataview_mymodels.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\dataview.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
+
+$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
+       @%create $(OBJS)\dataview.lbc
+       @%append $(OBJS)\dataview.lbc option quiet
+       @%append $(OBJS)\dataview.lbc name $^@
+       @%append $(OBJS)\dataview.lbc option caseexact
+       @%append $(OBJS)\dataview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i
+       @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res
+       @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
+       wlink @$(OBJS)\dataview.lbc
+
+$(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
+
+$(OBJS)\dataview_mymodels.obj :  .AUTODEPEND .\mymodels.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
+
+$(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 8863fc00bdcb04d40b5af35391ea8a615699b83d..32eb45d4267ba766ab25242d8ec5ee8aa38348eb 100644 (file)
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/debugrpt/debugrpt.dsp b/samples/debugrpt/debugrpt.dsp
index a4894fb3c41a29d51f4df554e78a27bcba223776..4b96e4246b6d2559ef3b500b61406ba38764b66e 100644 (file)
--- a/samples/debugrpt/debugrpt.dsp
+++ b/samples/debugrpt/debugrpt.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\debugrpt"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\debugrpt"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\debugrpt"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\debugrpt"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/debugrpt/debugrpt_vc7.vcproj b/samples/debugrpt/debugrpt_vc7.vcproj
index bf2628d5a54b1f3d0245e83fee917b049acbcf12..eabc82052bf75c44fccbe423d71dab04cf805524 100644 (file)
--- a/samples/debugrpt/debugrpt_vc7.vcproj
+++ b/samples/debugrpt/debugrpt_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\debugrpt.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\debugrpt.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/debugrpt/debugrpt_vc8.vcproj b/samples/debugrpt/debugrpt_vc8.vcproj
index 8eb2e209b689ec68134c22ee8898507a0d3610a7..6b6dc8aa8ca592955d349165f597394e69f20bca 100644 (file)
--- a/samples/debugrpt/debugrpt_vc8.vcproj
+++ b/samples/debugrpt/debugrpt_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/debugrpt/debugrpt_vc9.vcproj b/samples/debugrpt/debugrpt_vc9.vcproj
index d7be47a5a57eef6a1fb6ff5ccd6f267d8a84fbcf..a15df8fdb88f0a1fa4d0f2f0389b109498d18c7f 100644 (file)
--- a/samples/debugrpt/debugrpt_vc9.vcproj
+++ b/samples/debugrpt/debugrpt_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_qa.lib  wxmsw29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_qa.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxbase29u_xml.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\debugrpt.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc
index 5ce8dcc3e0302d6342330e3bd09ff0bbfd2676b4..2df15fd649ab05fc49a9c5c2d51e067ca821757f 100644 (file)
--- a/samples/debugrpt/makefile.bcc
+++ b/samples/debugrpt/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DEBUGRPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DEBUGRPT_OBJECTS =  \\r
-       $(OBJS)\debugrpt_debugrpt.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_QA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\debugrpt.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe\r
-       -if exist $(OBJS)\debugrpt.tds del $(OBJS)\debugrpt.tds\r
-       -if exist $(OBJS)\debugrpt.ilc del $(OBJS)\debugrpt.ilc\r
-       -if exist $(OBJS)\debugrpt.ild del $(OBJS)\debugrpt.ild\r
-       -if exist $(OBJS)\debugrpt.ilf del $(OBJS)\debugrpt.ilf\r
-       -if exist $(OBJS)\debugrpt.ils del $(OBJS)\debugrpt.ils\r
-\r
-$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS)  $(OBJS)\debugrpt_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res\r
-|\r
-\r
-$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp\r
-       $(CXX) -q -c -P -o$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DEBUGRPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DEBUGRPT_OBJECTS =  \
+       $(OBJS)\debugrpt_debugrpt.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_QA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\debugrpt.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
+       -if exist $(OBJS)\debugrpt.tds del $(OBJS)\debugrpt.tds
+       -if exist $(OBJS)\debugrpt.ilc del $(OBJS)\debugrpt.ilc
+       -if exist $(OBJS)\debugrpt.ild del $(OBJS)\debugrpt.ild
+       -if exist $(OBJS)\debugrpt.ilf del $(OBJS)\debugrpt.ilf
+       -if exist $(OBJS)\debugrpt.ils del $(OBJS)\debugrpt.ils
+
+$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS)  $(OBJS)\debugrpt_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res
+|
+
+$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp
+       $(CXX) -q -c -P -o$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp
+

diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc
index 8094c0c349d3b082960347ed606fa0d7c53ab21f..fa4b0e917fa321dff8b0f1d7ad449cf336cef274 100644 (file)
--- a/samples/debugrpt/makefile.gcc
+++ b/samples/debugrpt/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DEBUGRPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DEBUGRPT_OBJECTS =  \\r
-       $(OBJS)\debugrpt_sample_rc.o \\r
-       $(OBJS)\debugrpt_debugrpt.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_QA_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\debugrpt.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe\r
-\r
-$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o\r
-       $(CXX) -o $@ $(DEBUGRPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\debugrpt_debugrpt.o: ./debugrpt.cpp\r
-       $(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DEBUGRPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DEBUGRPT_OBJECTS =  \
+       $(OBJS)\debugrpt_sample_rc.o \
+       $(OBJS)\debugrpt_debugrpt.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_QA_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\debugrpt.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
+
+$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o
+       $(CXX) -o $@ $(DEBUGRPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\debugrpt_debugrpt.o: ./debugrpt.cpp
+       $(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx
index 5c6a2efbb47359c173f749fe4530c541fb753eab..5f95b14410dee32921e33ea62747dfca9b2f7f82 100644 (file)
--- a/samples/debugrpt/makefile.unx
+++ b/samples/debugrpt/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc
index 3192fb3062eca670a101eeffc77f0068fefc8bf5..1a1ee7bbdc711c76b471ce4eec9c1d02e3ede13c 100644 (file)
--- a/samples/debugrpt/makefile.vc
+++ b/samples/debugrpt/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DEBUGRPT_OBJECTS =  \\r
-       $(OBJS)\debugrpt_sample.res \\r
-       $(OBJS)\debugrpt_debugrpt.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_QA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\debugrpt.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe\r
-       -if exist $(OBJS)\debugrpt.ilk del $(OBJS)\debugrpt.ilk\r
-       -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb\r
-\r
-$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DEBUGRPT_OBJECTS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DEBUGRPT_OBJECTS =  \
+       $(OBJS)\debugrpt_debugrpt.obj
+DEBUGRPT_RESOURCES =  \
+       $(OBJS)\debugrpt_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_QA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\debugrpt.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
+       -if exist $(OBJS)\debugrpt.ilk del $(OBJS)\debugrpt.ilk
+       -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb
+
+$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DEBUGRPT_OBJECTS) $(DEBUGRPT_RESOURCES)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp
+

diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat
index 9d2669d9603b68f41e798d6133cbb12389da6d1f..bd1c9b93e46f1dfc5ffe41082dc049b5e1e17959 100644 (file)
--- a/samples/debugrpt/makefile.wat
+++ b/samples/debugrpt/makefile.wat
@@ -1,270 +1,270 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_QA_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_QA_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DEBUGRPT_OBJECTS =  &\r
-       $(OBJS)\debugrpt_debugrpt.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\debugrpt.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe\r
-\r
-$(OBJS)\debugrpt.exe :  $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res\r
-       @%create $(OBJS)\debugrpt.lbc\r
-       @%append $(OBJS)\debugrpt.lbc option quiet\r
-       @%append $(OBJS)\debugrpt.lbc name $^@\r
-       @%append $(OBJS)\debugrpt.lbc option caseexact\r
-       @%append $(OBJS)\debugrpt.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i\r
-       @for %i in ( $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i\r
-       @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res\r
-       @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i\r
-       wlink @$(OBJS)\debugrpt.lbc\r
-\r
-$(OBJS)\debugrpt_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\debugrpt_debugrpt.obj :  .AUTODEPEND .\debugrpt.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_QA_p =
+!ifeq MONOLITHIC 0
+__WXLIB_QA_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DEBUGRPT_OBJECTS =  &
+       $(OBJS)\debugrpt_debugrpt.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\debugrpt.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
+
+$(OBJS)\debugrpt.exe :  $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res
+       @%create $(OBJS)\debugrpt.lbc
+       @%append $(OBJS)\debugrpt.lbc option quiet
+       @%append $(OBJS)\debugrpt.lbc name $^@
+       @%append $(OBJS)\debugrpt.lbc option caseexact
+       @%append $(OBJS)\debugrpt.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i
+       @for %i in ( $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i
+       @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res
+       @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i
+       wlink @$(OBJS)\debugrpt.lbc
+
+$(OBJS)\debugrpt_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\debugrpt_debugrpt.obj :  .AUTODEPEND .\debugrpt.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $<
+

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 44ac0dfe5f65ae6385931012ce9edbd41ed463e8..f837c9907981d0d8be6ccda9e6d82b9de73ffc82 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp
index 8b56376d1f25240ca0c2a374d95c57b3aeaec77c..6baca81c9c0d59ac55b2666904a13435d26ed35a 100644 (file)
--- a/samples/dialogs/dialogs.dsp
+++ b/samples/dialogs/dialogs.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\dialogs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\dialogs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\dialogs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\dialogs"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj
index b6d844f8358f36bf496cba8f530b0c80a65f24a8..03acaab7f12af32b2e2f19ae6f6276b11b868cae 100644 (file)
--- a/samples/dialogs/dialogs_vc7.vcproj
+++ b/samples/dialogs/dialogs_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\dialogs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\dialogs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\dialogs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index 91ae8c274a8e12ec55143f51877e8a4e88f21181..ea124e3d001dcffc705aee663456afec66836db1 100644 (file)
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj
index c8bf5cdc6f4838e036cff4ecc53209bdda127df7..5ef059551df2da27b3997bd09c2b4c56725e33b1 100644 (file)
--- a/samples/dialogs/dialogs_vc9.vcproj
+++ b/samples/dialogs/dialogs_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dialogs.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 728a109bb38897c75e1be556810d170bcd476035..672303f36df875b87d9d6be542e9672448e7a361 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DIALOGS_OBJECTS =  \\r
-       $(OBJS)\dialogs_dialogs.obj \\r
-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"\r
-____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \\r
-       $(OBJS)\dialogs_colrdlgg.obj \\r
-       $(OBJS)\dialogs_dirdlgg.obj \\r
-       $(OBJS)\dialogs_filedlgg.obj \\r
-       $(OBJS)\dialogs_fontdlgg.obj\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dialogs.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
-       -if exist $(OBJS)\dialogs.tds del $(OBJS)\dialogs.tds\r
-       -if exist $(OBJS)\dialogs.ilc del $(OBJS)\dialogs.ilc\r
-       -if exist $(OBJS)\dialogs.ild del $(OBJS)\dialogs.ild\r
-       -if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf\r
-       -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils\r
-\r
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_dialogs.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp\r
-       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
-\r
-$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp\r
-       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp\r
-\r
-$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp\r
-       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp\r
-\r
-$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp\r
-       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp\r
-\r
-$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
-       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
-\r
-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dialogs.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DIALOGS_OBJECTS =  \
+       $(OBJS)\dialogs_dialogs.obj \
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+       $(OBJS)\dialogs_colrdlgg.obj \
+       $(OBJS)\dialogs_dirdlgg.obj \
+       $(OBJS)\dialogs_filedlgg.obj \
+       $(OBJS)\dialogs_fontdlgg.obj
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dialogs.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+       -if exist $(OBJS)\dialogs.tds del $(OBJS)\dialogs.tds
+       -if exist $(OBJS)\dialogs.ilc del $(OBJS)\dialogs.ilc
+       -if exist $(OBJS)\dialogs.ild del $(OBJS)\dialogs.ild
+       -if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf
+       -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils
+
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_dialogs.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
+
+$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
+
+$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
+
+$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
+
+$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
+
+$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dialogs.rc
+

diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index f5bb58d94df0a9e03fb996c7ef4cb48651d03a71..6e218fba93342bbbbcd1014737f01e168f18ce41 100644 (file)
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -1,256 +1,256 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DIALOGS_OBJECTS =  \\r
-       $(OBJS)\dialogs_dialogs.o \\r
-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \\r
-       $(OBJS)\dialogs_dialogs_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),0)\r
-ifeq ($(WXUNIV),0)\r
-____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \\r
-       $(OBJS)\dialogs_colrdlgg.o \\r
-       $(OBJS)\dialogs_dirdlgg.o \\r
-       $(OBJS)\dialogs_filedlgg.o \\r
-       $(OBJS)\dialogs_fontdlgg.o\r
-endif\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dialogs.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
-\r
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o\r
-       $(CXX) -o $@ $(DIALOGS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp\r
-       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp\r
-       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp\r
-       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp\r
-       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp\r
-       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DIALOGS_OBJECTS =  \
+       $(OBJS)\dialogs_dialogs.o \
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \
+       $(OBJS)\dialogs_dialogs_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(SHARED),0)
+ifeq ($(WXUNIV),0)
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+       $(OBJS)\dialogs_colrdlgg.o \
+       $(OBJS)\dialogs_dirdlgg.o \
+       $(OBJS)\dialogs_filedlgg.o \
+       $(OBJS)\dialogs_fontdlgg.o
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dialogs.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o
+       $(CXX) -o $@ $(DIALOGS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp
+       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp
+       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp
+       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
+       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp
+       $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index 9fae014f0f07a805b1c493eab3b86e10a7ac1b46..958db2af5660850d86c6bb8e5a7f694428e493d0 100644 (file)
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 254e884b51d33417aa51370222343f1610ca1785..7b9c5c06d4f217798ec07b896ebc1764f9a9e849 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -1,339 +1,364 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DIALOGS_OBJECTS =  \\r
-       $(OBJS)\dialogs_dialogs.obj \\r
-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \\r
-       $(OBJS)\dialogs_dialogs.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"\r
-____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \\r
-       $(OBJS)\dialogs_colrdlgg.obj \\r
-       $(OBJS)\dialogs_dirdlgg.obj \\r
-       $(OBJS)\dialogs_filedlgg.obj \\r
-       $(OBJS)\dialogs_fontdlgg.obj\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dialogs.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
-       -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk\r
-       -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb\r
-\r
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DIALOGS_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
-\r
-$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp\r
-\r
-$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp\r
-\r
-$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp\r
-\r
-$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
-\r
-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DIALOGS_OBJECTS =  \
+       $(OBJS)\dialogs_dialogs.obj \
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
+DIALOGS_RESOURCES =  \
+       $(OBJS)\dialogs_dialogs.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+       $(OBJS)\dialogs_colrdlgg.obj \
+       $(OBJS)\dialogs_dirdlgg.obj \
+       $(OBJS)\dialogs_filedlgg.obj \
+       $(OBJS)\dialogs_fontdlgg.obj
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dialogs.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+       -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk
+       -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb
+
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
+
+$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
+
+$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
+
+$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
+
+$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
+
+$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc
+

diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index 03a1b68d09f402523b1c27e2b3482c7cd1eea8af..e5284c29b8e70328ebf500959819ec9a49d2be78 100644 (file)
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -1,292 +1,292 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =\r
-!ifeq SHARED 0\r
-!ifeq WXUNIV 0\r
-____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  &\r
-       $(OBJS)\dialogs_colrdlgg.obj &\r
-       $(OBJS)\dialogs_dirdlgg.obj &\r
-       $(OBJS)\dialogs_filedlgg.obj &\r
-       $(OBJS)\dialogs_fontdlgg.obj\r
-!endif\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DIALOGS_OBJECTS =  &\r
-       $(OBJS)\dialogs_dialogs.obj &\r
-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\dialogs.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
-\r
-$(OBJS)\dialogs.exe :  $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res\r
-       @%create $(OBJS)\dialogs.lbc\r
-       @%append $(OBJS)\dialogs.lbc option quiet\r
-       @%append $(OBJS)\dialogs.lbc name $^@\r
-       @%append $(OBJS)\dialogs.lbc option caseexact\r
-       @%append $(OBJS)\dialogs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i\r
-       @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res\r
-       @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i\r
-       wlink @$(OBJS)\dialogs.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
-\r
-$(OBJS)\dialogs_colrdlgg.obj :  .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
-\r
-$(OBJS)\dialogs_dirdlgg.obj :  .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
-\r
-$(OBJS)\dialogs_filedlgg.obj :  .AUTODEPEND .\..\..\src\generic\filedlgg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
-\r
-$(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
-\r
-$(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =
+!ifeq SHARED 0
+!ifeq WXUNIV 0
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  &
+       $(OBJS)\dialogs_colrdlgg.obj &
+       $(OBJS)\dialogs_dirdlgg.obj &
+       $(OBJS)\dialogs_filedlgg.obj &
+       $(OBJS)\dialogs_fontdlgg.obj
+!endif
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DIALOGS_OBJECTS =  &
+       $(OBJS)\dialogs_dialogs.obj &
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\dialogs.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+
+$(OBJS)\dialogs.exe :  $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
+       @%create $(OBJS)\dialogs.lbc
+       @%append $(OBJS)\dialogs.lbc option quiet
+       @%append $(OBJS)\dialogs.lbc name $^@
+       @%append $(OBJS)\dialogs.lbc option caseexact
+       @%append $(OBJS)\dialogs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i
+       @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
+       @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i
+       wlink @$(OBJS)\dialogs.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_colrdlgg.obj :  .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_dirdlgg.obj :  .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_filedlgg.obj :  .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 8848f900694b97aadd74a8156a3a3a80de6b077f..a86267f4374d2808bb68cecad98d69fed7b19462 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp
index d1ab143fc7afd22d456bb5cdd9072c5eb1cdbe22..b6ddced5790b419f0004c34c2abf3e2817f63f69 100644 (file)
--- a/samples/dialup/dialup.dsp
+++ b/samples/dialup/dialup.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\nettest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\nettest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\nettest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\nettest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj
index ba962952d2902a6b9d7b5633ab5bccf0bdbfad35..46ad36f2bf8946ab56dd723ceed7bb1a3dfb758f 100644 (file)
--- a/samples/dialup/dialup_vc7.vcproj
+++ b/samples/dialup/dialup_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\nettest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\nettest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\nettest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\nettest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj
index fded86f2ea437331d0fc2b143d16b78d13f00e5b..657925359896a7b08f4735748ab26a00da5a6a32 100644 (file)
--- a/samples/dialup/dialup_vc8.vcproj
+++ b/samples/dialup/dialup_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj
index 925de329ceaabf7753a98c6cb4a7a6512e00b487..3b1b90b1943dc048350225d1b4d183a8291c840e 100644 (file)
--- a/samples/dialup/dialup_vc9.vcproj
+++ b/samples/dialup/dialup_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nettest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\nettest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index 50b40b1077759e376a03e71a4d0a0880c31733dc..1b93c8206d5b0a2116200189a5729d990f6b6fb8 100644 (file)
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NETTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-NETTEST_OBJECTS =  \\r
-       $(OBJS)\nettest_nettest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nettest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
-       -if exist $(OBJS)\nettest.tds del $(OBJS)\nettest.tds\r
-       -if exist $(OBJS)\nettest.ilc del $(OBJS)\nettest.ilc\r
-       -if exist $(OBJS)\nettest.ild del $(OBJS)\nettest.ild\r
-       -if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf\r
-       -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils\r
-\r
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS)  $(OBJS)\nettest_nettest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_nettest.res\r
-|\r
-\r
-$(OBJS)\nettest_nettest.obj: .\nettest.cpp\r
-       $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
-\r
-$(OBJS)\nettest_nettest.res: .\nettest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nettest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NETTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+NETTEST_OBJECTS =  \
+       $(OBJS)\nettest_nettest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nettest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
+       -if exist $(OBJS)\nettest.tds del $(OBJS)\nettest.tds
+       -if exist $(OBJS)\nettest.ilc del $(OBJS)\nettest.ilc
+       -if exist $(OBJS)\nettest.ild del $(OBJS)\nettest.ild
+       -if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf
+       -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils
+
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS)  $(OBJS)\nettest_nettest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_nettest.res
+|
+
+$(OBJS)\nettest_nettest.obj: .\nettest.cpp
+       $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp
+
+$(OBJS)\nettest_nettest.res: .\nettest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nettest.rc
+

diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index 9807e8fe463ec5266db7480d28b4d9d7122c5096..d9dc6e2cab291e9ec53893a30fa7a940257258b0 100644 (file)
--- a/samples/dialup/makefile.gcc
+++ b/samples/dialup/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NETTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-NETTEST_OBJECTS =  \\r
-       $(OBJS)\nettest_nettest.o \\r
-       $(OBJS)\nettest_nettest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nettest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
-\r
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o\r
-       $(CXX) -o $@ $(NETTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\nettest_nettest.o: ./nettest.cpp\r
-       $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\nettest_nettest_rc.o: ./nettest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NETTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+NETTEST_OBJECTS =  \
+       $(OBJS)\nettest_nettest.o \
+       $(OBJS)\nettest_nettest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nettest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
+
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o
+       $(CXX) -o $@ $(NETTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\nettest_nettest.o: ./nettest.cpp
+       $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\nettest_nettest_rc.o: ./nettest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx
index 31598d75bf0bd6888b17324aa1d357ccbbdda92f..75191aacf407f95be5c8125832ff591c1d31db52 100644 (file)
--- a/samples/dialup/makefile.unx
+++ b/samples/dialup/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index b0e425d9d85cb5537f932dccc6fae6e2e94238fc..857162bcc0aa4a89098297a268eea0eb1e58cd2e 100644 (file)
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-NETTEST_OBJECTS =  \\r
-       $(OBJS)\nettest_nettest.obj \\r
-       $(OBJS)\nettest_nettest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nettest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
-       -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk\r
-       -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb\r
-\r
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(NETTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\nettest_nettest.obj: .\nettest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
-\r
-$(OBJS)\nettest_nettest.res: .\nettest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+NETTEST_OBJECTS =  \
+       $(OBJS)\nettest_nettest.obj
+NETTEST_RESOURCES =  \
+       $(OBJS)\nettest_nettest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nettest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
+       -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk
+       -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb
+
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(NETTEST_OBJECTS) $(NETTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\nettest_nettest.obj: .\nettest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp
+
+$(OBJS)\nettest_nettest.res: .\nettest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc
+

diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
index 106412d49d24bf38811b3fa335262e0f5f7ab90c..d00eb457a170f990bd1477199cbe5b132cead75a 100644 (file)
--- a/samples/dialup/makefile.wat
+++ b/samples/dialup/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-NETTEST_OBJECTS =  &\r
-       $(OBJS)\nettest_nettest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\nettest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
-\r
-$(OBJS)\nettest.exe :  $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res\r
-       @%create $(OBJS)\nettest.lbc\r
-       @%append $(OBJS)\nettest.lbc option quiet\r
-       @%append $(OBJS)\nettest.lbc name $^@\r
-       @%append $(OBJS)\nettest.lbc option caseexact\r
-       @%append $(OBJS)\nettest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nettest.lbc library %i\r
-       @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res\r
-       @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i\r
-       wlink @$(OBJS)\nettest.lbc\r
-\r
-$(OBJS)\nettest_nettest.obj :  .AUTODEPEND .\nettest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\nettest_nettest.res :  .AUTODEPEND .\nettest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+NETTEST_OBJECTS =  &
+       $(OBJS)\nettest_nettest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\nettest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
+
+$(OBJS)\nettest.exe :  $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
+       @%create $(OBJS)\nettest.lbc
+       @%append $(OBJS)\nettest.lbc option quiet
+       @%append $(OBJS)\nettest.lbc name $^@
+       @%append $(OBJS)\nettest.lbc option caseexact
+       @%append $(OBJS)\nettest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nettest.lbc library %i
+       @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res
+       @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i
+       wlink @$(OBJS)\nettest.lbc
+
+$(OBJS)\nettest_nettest.obj :  .AUTODEPEND .\nettest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $<
+
+$(OBJS)\nettest_nettest.res :  .AUTODEPEND .\nettest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 5c2fe5dc56578bf278da72a37afc9e6f1f0520f4..1d1eedd4dd1c8654cc8c2813c842845ea0449563 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/display/display.dsp b/samples/display/display.dsp
index b773107947b8415ee843b071b02d7bd6dc424d7e..192a02e60c54356539dbf138a059a87673a6bafb 100644 (file)
--- a/samples/display/display.dsp
+++ b/samples/display/display.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\display"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\display"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\display"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\display"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/display/display_vc7.vcproj b/samples/display/display_vc7.vcproj
index 372668c071951e26d9581118a191e21b68bd3e16..cb25313f49dc3c072832702f6994434bd350d060 100644 (file)
--- a/samples/display/display_vc7.vcproj
+++ b/samples/display/display_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\display.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\display.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\display.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\display.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/display/display_vc8.vcproj b/samples/display/display_vc8.vcproj
index dda860cdc538b2e16f21eb66da722bf353861504..2243dfde5ab3d31970efff7a0381b56d818823ee 100644 (file)
--- a/samples/display/display_vc8.vcproj
+++ b/samples/display/display_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/display/display_vc9.vcproj b/samples/display/display_vc9.vcproj
index 957eba7d39d69bfbdbbc4744805d807a26eb9073..9a6b890ece92f34629d7a079be1235a3f9fc4754 100644 (file)
--- a/samples/display/display_vc9.vcproj
+++ b/samples/display/display_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\display.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\display.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc
index d7208a12bdba23d7021b8a6c646b844fe7377efe..a69e47cf1515c6c072b49b8a578b5944448b4729 100644 (file)
--- a/samples/display/makefile.bcc
+++ b/samples/display/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DISPLAY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DISPLAY_OBJECTS =  \\r
-       $(OBJS)\display_display.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\display.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe\r
-       -if exist $(OBJS)\display.tds del $(OBJS)\display.tds\r
-       -if exist $(OBJS)\display.ilc del $(OBJS)\display.ilc\r
-       -if exist $(OBJS)\display.ild del $(OBJS)\display.ild\r
-       -if exist $(OBJS)\display.ilf del $(OBJS)\display.ilf\r
-       -if exist $(OBJS)\display.ils del $(OBJS)\display.ils\r
-\r
-$(OBJS)\display.exe: $(DISPLAY_OBJECTS)  $(OBJS)\display_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DISPLAY_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\display_sample.res\r
-|\r
-\r
-$(OBJS)\display_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\display_display.obj: .\display.cpp\r
-       $(CXX) -q -c -P -o$@ $(DISPLAY_CXXFLAGS) .\display.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DISPLAY_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DISPLAY_OBJECTS =  \
+       $(OBJS)\display_display.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\display.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe
+       -if exist $(OBJS)\display.tds del $(OBJS)\display.tds
+       -if exist $(OBJS)\display.ilc del $(OBJS)\display.ilc
+       -if exist $(OBJS)\display.ild del $(OBJS)\display.ild
+       -if exist $(OBJS)\display.ilf del $(OBJS)\display.ilf
+       -if exist $(OBJS)\display.ils del $(OBJS)\display.ils
+
+$(OBJS)\display.exe: $(DISPLAY_OBJECTS)  $(OBJS)\display_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DISPLAY_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\display_sample.res
+|
+
+$(OBJS)\display_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\display_display.obj: .\display.cpp
+       $(CXX) -q -c -P -o$@ $(DISPLAY_CXXFLAGS) .\display.cpp
+

diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc
index cd3b5c1aaf5629ab95a78bc98ad2206922e406f5..d6844c4d49eb57fafdb8c9be103216d10e146556 100644 (file)
--- a/samples/display/makefile.gcc
+++ b/samples/display/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DISPLAY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DISPLAY_OBJECTS =  \\r
-       $(OBJS)\display_sample_rc.o \\r
-       $(OBJS)\display_display.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\display.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe\r
-\r
-$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample_rc.o\r
-       $(CXX) -o $@ $(DISPLAY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\display_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\display_display.o: ./display.cpp\r
-       $(CXX) -c -o $@ $(DISPLAY_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DISPLAY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DISPLAY_OBJECTS =  \
+       $(OBJS)\display_sample_rc.o \
+       $(OBJS)\display_display.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\display.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe
+
+$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample_rc.o
+       $(CXX) -o $@ $(DISPLAY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\display_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\display_display.o: ./display.cpp
+       $(CXX) -c -o $@ $(DISPLAY_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx
index 56aa6e393c26f4c325fe94cf62a341beed42c6d5..e01ea3567e65c39ab59c5872f159d154809b1a51 100644 (file)
--- a/samples/display/makefile.unx
+++ b/samples/display/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc
index 921170b187bd99ae61beef392597ee6398bbb66c..894a1e2d0bb767d5d6a06815f70dd007a40cbf6a 100644 (file)
--- a/samples/display/makefile.vc
+++ b/samples/display/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DISPLAY_OBJECTS =  \\r
-       $(OBJS)\display_sample.res \\r
-       $(OBJS)\display_display.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\display.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe\r
-       -if exist $(OBJS)\display.ilk del $(OBJS)\display.ilk\r
-       -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb\r
-\r
-$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DISPLAY_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\display_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\display_display.obj: .\display.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DISPLAY_CXXFLAGS) .\display.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DISPLAY_OBJECTS =  \
+       $(OBJS)\display_display.obj
+DISPLAY_RESOURCES =  \
+       $(OBJS)\display_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\display.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe
+       -if exist $(OBJS)\display.ilk del $(OBJS)\display.ilk
+       -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb
+
+$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DISPLAY_OBJECTS) $(DISPLAY_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\display_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\display_display.obj: .\display.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DISPLAY_CXXFLAGS) .\display.cpp
+

diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat
index 520a8ce5dd4e99527fc63fac544106fcfc0f4a37..daeb8b21bb7ec6b5e6f925a42078be79906a54e6 100644 (file)
--- a/samples/display/makefile.wat
+++ b/samples/display/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DISPLAY_OBJECTS =  &\r
-       $(OBJS)\display_display.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\display.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe\r
-\r
-$(OBJS)\display.exe :  $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res\r
-       @%create $(OBJS)\display.lbc\r
-       @%append $(OBJS)\display.lbc option quiet\r
-       @%append $(OBJS)\display.lbc name $^@\r
-       @%append $(OBJS)\display.lbc option caseexact\r
-       @%append $(OBJS)\display.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\display.lbc library %i\r
-       @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res\r
-       @for %i in () do @%append $(OBJS)\display.lbc option stack=%i\r
-       wlink @$(OBJS)\display.lbc\r
-\r
-$(OBJS)\display_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\display_display.obj :  .AUTODEPEND .\display.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DISPLAY_OBJECTS =  &
+       $(OBJS)\display_display.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\display.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\display.exe del $(OBJS)\display.exe
+
+$(OBJS)\display.exe :  $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res
+       @%create $(OBJS)\display.lbc
+       @%append $(OBJS)\display.lbc option quiet
+       @%append $(OBJS)\display.lbc name $^@
+       @%append $(OBJS)\display.lbc option caseexact
+       @%append $(OBJS)\display.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\display.lbc library %i
+       @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res
+       @for %i in () do @%append $(OBJS)\display.lbc option stack=%i
+       wlink @$(OBJS)\display.lbc
+
+$(OBJS)\display_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\display_display.obj :  .AUTODEPEND .\display.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $<
+

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 17daf50d1beedb7e6282a3b4f67cca1c7761c96a..1d15aa2f4ad92099f07c9aaf72fd525133d59b3e 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dnd/dnd.dsp b/samples/dnd/dnd.dsp
index 744b5731e78cca9594308a2eb32b1a12ed734ea9..43d9a2b045a1c89c7641f082fc916ea12492f407 100644 (file)
--- a/samples/dnd/dnd.dsp
+++ b/samples/dnd/dnd.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\dnd"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\dnd"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\dnd"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\dnd"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/dnd/dnd_vc7.vcproj b/samples/dnd/dnd_vc7.vcproj
index 1112bf73d9894010dc9e71c05cbdabdd47e9e16b..a92c0b45ef86a1cc6c0574148823a8278f7ce7b7 100644 (file)
--- a/samples/dnd/dnd_vc7.vcproj
+++ b/samples/dnd/dnd_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\dnd.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\dnd.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\dnd.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\dnd.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/dnd/dnd_vc8.vcproj b/samples/dnd/dnd_vc8.vcproj
index 26e9a64ae6143832f24db96fd106e24d16d6f8da..76a94ad66c40c52b24d1a9f08960a77e77f82a3f 100644 (file)
--- a/samples/dnd/dnd_vc8.vcproj
+++ b/samples/dnd/dnd_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dnd/dnd_vc9.vcproj b/samples/dnd/dnd_vc9.vcproj
index 60ab53859a227244bb693c370c697f402ea06b68..313f61a615fdbc47db4429819f6cdec7d75b556c 100644 (file)
--- a/samples/dnd/dnd_vc9.vcproj
+++ b/samples/dnd/dnd_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dnd.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dnd.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc
index 5a3cb6df8deee03ae37afdf8d36936265e7000d4..346279572c1883c62f36ce7ed603a57b9c74bc26 100644 (file)
--- a/samples/dnd/makefile.bcc
+++ b/samples/dnd/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DND_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DND_OBJECTS =  \\r
-       $(OBJS)\dnd_dnd.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dnd.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe\r
-       -if exist $(OBJS)\dnd.tds del $(OBJS)\dnd.tds\r
-       -if exist $(OBJS)\dnd.ilc del $(OBJS)\dnd.ilc\r
-       -if exist $(OBJS)\dnd.ild del $(OBJS)\dnd.ild\r
-       -if exist $(OBJS)\dnd.ilf del $(OBJS)\dnd.ilf\r
-       -if exist $(OBJS)\dnd.ils del $(OBJS)\dnd.ils\r
-\r
-$(OBJS)\dnd.exe: $(DND_OBJECTS)  $(OBJS)\dnd_dnd.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DND_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dnd_dnd.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dnd_dnd.obj: .\dnd.cpp\r
-       $(CXX) -q -c -P -o$@ $(DND_CXXFLAGS) .\dnd.cpp\r
-\r
-$(OBJS)\dnd_dnd.res: .\dnd.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dnd.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DND_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DND_OBJECTS =  \
+       $(OBJS)\dnd_dnd.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dnd.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
+       -if exist $(OBJS)\dnd.tds del $(OBJS)\dnd.tds
+       -if exist $(OBJS)\dnd.ilc del $(OBJS)\dnd.ilc
+       -if exist $(OBJS)\dnd.ild del $(OBJS)\dnd.ild
+       -if exist $(OBJS)\dnd.ilf del $(OBJS)\dnd.ilf
+       -if exist $(OBJS)\dnd.ils del $(OBJS)\dnd.ils
+
+$(OBJS)\dnd.exe: $(DND_OBJECTS)  $(OBJS)\dnd_dnd.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DND_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dnd_dnd.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dnd_dnd.obj: .\dnd.cpp
+       $(CXX) -q -c -P -o$@ $(DND_CXXFLAGS) .\dnd.cpp
+
+$(OBJS)\dnd_dnd.res: .\dnd.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dnd.rc
+

diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index 2c74fbede7876493ca0a8d8ca9f245df56adce08..2776512beb1f0fe18120f8ea196362e33e6ac292 100644 (file)
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DND_OBJECTS =  \\r
-       $(OBJS)\dnd_dnd.o \\r
-       $(OBJS)\dnd_dnd_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dnd.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe\r
-\r
-$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o\r
-       $(CXX) -o $@ $(DND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (wxwin.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\dnd_dnd.o: ./dnd.cpp\r
-       $(CXX) -c -o $@ $(DND_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dnd_dnd_rc.o: ./dnd.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+DND_OBJECTS =  \
+       $(OBJS)\dnd_dnd.o \
+       $(OBJS)\dnd_dnd_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dnd.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
+
+$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o
+       $(CXX) -o $@ $(DND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (wxwin.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\dnd_dnd.o: ./dnd.cpp
+       $(CXX) -c -o $@ $(DND_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dnd_dnd_rc.o: ./dnd.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
index 4eba6d49038d7188469da4e64f0f5b61749b52d6..2377649e22efe6d12fe37386b376cc10143d68b9 100644 (file)
--- a/samples/dnd/makefile.unx
+++ b/samples/dnd/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index 9cf20c986c8482413b361cd1be167356819cce99..c1eb5a5dc8be046975e3337f9e20a2001e6bb50a 100644 (file)
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DND_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DND_OBJECTS =  \\r
-       $(OBJS)\dnd_dnd.obj \\r
-       $(OBJS)\dnd_dnd.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dnd.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe\r
-       -if exist $(OBJS)\dnd.ilk del $(OBJS)\dnd.ilk\r
-       -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb\r
-\r
-$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DND_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dnd_dnd.obj: .\dnd.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) .\dnd.cpp\r
-\r
-$(OBJS)\dnd_dnd.res: .\dnd.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dnd.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DND_OBJECTS =  \
+       $(OBJS)\dnd_dnd.obj
+DND_RESOURCES =  \
+       $(OBJS)\dnd_dnd.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dnd.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
+       -if exist $(OBJS)\dnd.ilk del $(OBJS)\dnd.ilk
+       -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb
+
+$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DND_OBJECTS) $(DND_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dnd_dnd.obj: .\dnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) .\dnd.cpp
+
+$(OBJS)\dnd_dnd.res: .\dnd.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dnd.rc
+

diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat
index dea15c6ec908043148127174198db7de3c9c1e0d..1f37ceabeda4a544476faa15de2b73f139f126a9 100644 (file)
--- a/samples/dnd/makefile.wat
+++ b/samples/dnd/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DND_OBJECTS =  &\r
-       $(OBJS)\dnd_dnd.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\dnd.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe\r
-\r
-$(OBJS)\dnd.exe :  $(DND_OBJECTS) $(OBJS)\dnd_dnd.res\r
-       @%create $(OBJS)\dnd.lbc\r
-       @%append $(OBJS)\dnd.lbc option quiet\r
-       @%append $(OBJS)\dnd.lbc name $^@\r
-       @%append $(OBJS)\dnd.lbc option caseexact\r
-       @%append $(OBJS)\dnd.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dnd.lbc library %i\r
-       @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res\r
-       @for %i in () do @%append $(OBJS)\dnd.lbc option stack=%i\r
-       wlink @$(OBJS)\dnd.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dnd_dnd.obj :  .AUTODEPEND .\dnd.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DND_CXXFLAGS) $<\r
-\r
-$(OBJS)\dnd_dnd.res :  .AUTODEPEND .\dnd.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DND_OBJECTS =  &
+       $(OBJS)\dnd_dnd.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\dnd.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
+
+$(OBJS)\dnd.exe :  $(DND_OBJECTS) $(OBJS)\dnd_dnd.res
+       @%create $(OBJS)\dnd.lbc
+       @%append $(OBJS)\dnd.lbc option quiet
+       @%append $(OBJS)\dnd.lbc name $^@
+       @%append $(OBJS)\dnd.lbc option caseexact
+       @%append $(OBJS)\dnd.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dnd.lbc library %i
+       @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res
+       @for %i in () do @%append $(OBJS)\dnd.lbc option stack=%i
+       wlink @$(OBJS)\dnd.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dnd_dnd.obj :  .AUTODEPEND .\dnd.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DND_CXXFLAGS) $<
+
+$(OBJS)\dnd_dnd.res :  .AUTODEPEND .\dnd.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index f765811450c224c6337ec674acb76990ede84263..a05291860cf7c7a8d4dec8d796e72a831d218481 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/docview/docview.dsp b/samples/docview/docview.dsp
index 67624eb95d109357b0bebcb49071fbb0dbf046ee..802d71f778019813a22cc179c02d55243a13deb2 100644 (file)
--- a/samples/docview/docview.dsp
+++ b/samples/docview/docview.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\docview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\docview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\docview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\docview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj
index 76e91b9de2d8ec76c691b617b12f0a99ca639596..7a1b5573911a217ae7c3e462579044ed0734bb38 100644 (file)
--- a/samples/docview/docview_vc7.vcproj
+++ b/samples/docview/docview_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\docview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\docview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\docview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\docview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj
index 58f95dabe36d21527120af454de8b1267fcea6aa..e0005c1e3acecdcb9552aaa5a40d110cfe321390 100644 (file)
--- a/samples/docview/docview_vc8.vcproj
+++ b/samples/docview/docview_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/docview/docview_vc9.vcproj b/samples/docview/docview_vc9.vcproj
index b832188c2266402203f6b75779edf59f5a60459e..24673018b760dcbd438a73deadbb77f3ec1683aa 100644 (file)
--- a/samples/docview/docview_vc9.vcproj
+++ b/samples/docview/docview_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\docview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\docview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index fbd20d34057a09a07fd5c36868f7dd43cb0344f6..2e3423d7435cac763e5dc34263bf7ef6c514a7ed 100644 (file)
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DOCVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DOCVIEW_OBJECTS =  \\r
-       $(OBJS)\docview_docview.obj \\r
-       $(OBJS)\docview_doc.obj \\r
-       $(OBJS)\docview_view.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\docview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe\r
-       -if exist $(OBJS)\docview.tds del $(OBJS)\docview.tds\r
-       -if exist $(OBJS)\docview.ilc del $(OBJS)\docview.ilc\r
-       -if exist $(OBJS)\docview.ild del $(OBJS)\docview.ild\r
-       -if exist $(OBJS)\docview.ilf del $(OBJS)\docview.ilf\r
-       -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils\r
-\r
-$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res\r
-|\r
-\r
-$(OBJS)\docview_docview.obj: .\docview.cpp\r
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp\r
-\r
-$(OBJS)\docview_doc.obj: .\doc.cpp\r
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp\r
-\r
-$(OBJS)\docview_view.obj: .\view.cpp\r
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\view.cpp\r
-\r
-$(OBJS)\docview_docview.res: .\docview.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\docview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DOCVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DOCVIEW_OBJECTS =  \
+       $(OBJS)\docview_docview.obj \
+       $(OBJS)\docview_doc.obj \
+       $(OBJS)\docview_view.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\docview.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
+       -if exist $(OBJS)\docview.tds del $(OBJS)\docview.tds
+       -if exist $(OBJS)\docview.ilc del $(OBJS)\docview.ilc
+       -if exist $(OBJS)\docview.ild del $(OBJS)\docview.ild
+       -if exist $(OBJS)\docview.ilf del $(OBJS)\docview.ilf
+       -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils
+
+$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
+|
+
+$(OBJS)\docview_docview.obj: .\docview.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp
+
+$(OBJS)\docview_doc.obj: .\doc.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp
+
+$(OBJS)\docview_view.obj: .\view.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) .\view.cpp
+
+$(OBJS)\docview_docview.res: .\docview.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\docview.rc
+

diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index e5b4ffc8793ad498818eff5843245e9338702aaa..413fd73f75842236f3cc0346da88c9527597489a 100644 (file)
--- a/samples/docview/makefile.gcc
+++ b/samples/docview/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DOCVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DOCVIEW_OBJECTS =  \\r
-       $(OBJS)\docview_docview.o \\r
-       $(OBJS)\docview_doc.o \\r
-       $(OBJS)\docview_view.o \\r
-       $(OBJS)\docview_docview_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\docview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe\r
-\r
-$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o\r
-       $(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\docview_docview.o: ./docview.cpp\r
-       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\docview_doc.o: ./doc.cpp\r
-       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\docview_view.o: ./view.cpp\r
-       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\docview_docview_rc.o: ./docview.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DOCVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DOCVIEW_OBJECTS =  \
+       $(OBJS)\docview_docview.o \
+       $(OBJS)\docview_doc.o \
+       $(OBJS)\docview_view.o \
+       $(OBJS)\docview_docview_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\docview.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
+
+$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o
+       $(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\docview_docview.o: ./docview.cpp
+       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\docview_doc.o: ./doc.cpp
+       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\docview_view.o: ./view.cpp
+       $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\docview_docview_rc.o: ./docview.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index 77f3792b87e8a23932f565c8554259a90794779f..26172bee3fbc03deb24230c10a2f9e835a7da12c 100644 (file)
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index b0f937b4b0d991cad3574559386715c30cce720b..882e0ee2d72e5fb4336a56d3711842dbc7f2d5c2 100644 (file)
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DOCVIEW_OBJECTS =  \\r
-       $(OBJS)\docview_docview.obj \\r
-       $(OBJS)\docview_doc.obj \\r
-       $(OBJS)\docview_view.obj \\r
-       $(OBJS)\docview_docview.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\docview.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe\r
-       -if exist $(OBJS)\docview.ilk del $(OBJS)\docview.ilk\r
-       -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb\r
-\r
-$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DOCVIEW_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\docview_docview.obj: .\docview.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp\r
-\r
-$(OBJS)\docview_doc.obj: .\doc.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp\r
-\r
-$(OBJS)\docview_view.obj: .\view.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\view.cpp\r
-\r
-$(OBJS)\docview_docview.res: .\docview.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\docview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DOCVIEW_OBJECTS =  \
+       $(OBJS)\docview_docview.obj \
+       $(OBJS)\docview_doc.obj \
+       $(OBJS)\docview_view.obj
+DOCVIEW_RESOURCES =  \
+       $(OBJS)\docview_docview.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\docview.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
+       -if exist $(OBJS)\docview.ilk del $(OBJS)\docview.ilk
+       -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb
+
+$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\docview_docview.obj: .\docview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp
+
+$(OBJS)\docview_doc.obj: .\doc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp
+
+$(OBJS)\docview_view.obj: .\view.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\view.cpp
+
+$(OBJS)\docview_docview.res: .\docview.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\docview.rc
+

diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index 456a4facbc5f689623a5dc7a9fd61bdd54bdc2e9..00cdae60fd6ce5c93dcb6e9d7104bc572a18a097 100644 (file)
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -1,268 +1,268 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DOCVIEW_OBJECTS =  &\r
-       $(OBJS)\docview_docview.obj &\r
-       $(OBJS)\docview_doc.obj &\r
-       $(OBJS)\docview_view.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\docview.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe\r
-\r
-$(OBJS)\docview.exe :  $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res\r
-       @%create $(OBJS)\docview.lbc\r
-       @%append $(OBJS)\docview.lbc option quiet\r
-       @%append $(OBJS)\docview.lbc name $^@\r
-       @%append $(OBJS)\docview.lbc option caseexact\r
-       @%append $(OBJS)\docview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\docview.lbc library %i\r
-       @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res\r
-       @for %i in () do @%append $(OBJS)\docview.lbc option stack=%i\r
-       wlink @$(OBJS)\docview.lbc\r
-\r
-$(OBJS)\docview_docview.obj :  .AUTODEPEND .\docview.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\docview_doc.obj :  .AUTODEPEND .\doc.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\docview_view.obj :  .AUTODEPEND .\view.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\docview_docview.res :  .AUTODEPEND .\docview.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DOCVIEW_OBJECTS =  &
+       $(OBJS)\docview_docview.obj &
+       $(OBJS)\docview_doc.obj &
+       $(OBJS)\docview_view.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\docview.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
+
+$(OBJS)\docview.exe :  $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
+       @%create $(OBJS)\docview.lbc
+       @%append $(OBJS)\docview.lbc option quiet
+       @%append $(OBJS)\docview.lbc name $^@
+       @%append $(OBJS)\docview.lbc option caseexact
+       @%append $(OBJS)\docview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\docview.lbc library %i
+       @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res
+       @for %i in () do @%append $(OBJS)\docview.lbc option stack=%i
+       wlink @$(OBJS)\docview.lbc
+
+$(OBJS)\docview_docview.obj :  .AUTODEPEND .\docview.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+
+$(OBJS)\docview_doc.obj :  .AUTODEPEND .\doc.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+
+$(OBJS)\docview_view.obj :  .AUTODEPEND .\view.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+
+$(OBJS)\docview_docview.res :  .AUTODEPEND .\docview.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index a68f57b3aa6a6eac2bdba34c2e33c10036681098..88bb3713a80e90b4cc44f682a57c1c97b0778e53 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dragimag/dragimag.dsp b/samples/dragimag/dragimag.dsp
index 2cc1bb916b081229371d6d79e8c8009acb238e82..a3ed339aba538fa67a654fa61bbe824016e0823f 100644 (file)
--- a/samples/dragimag/dragimag.dsp
+++ b/samples/dragimag/dragimag.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\dragimag"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\dragimag"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\dragimag"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\dragimag"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj
index 0dc32409211990dec817feba15c3ed59f1ad0181..104d90668645a70e07db37c1f8ef3fe333f48f66 100644 (file)
--- a/samples/dragimag/dragimag_vc7.vcproj
+++ b/samples/dragimag/dragimag_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\dragimag.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\dragimag.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\dragimag.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/dragimag/dragimag_vc8.vcproj b/samples/dragimag/dragimag_vc8.vcproj
index 33b6d86623e23527e683bc57b8426fd6d7bf110b..df6f70543619b8d958cdc7da9f06d00d49b7dca1 100644 (file)
--- a/samples/dragimag/dragimag_vc8.vcproj
+++ b/samples/dragimag/dragimag_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dragimag/dragimag_vc9.vcproj b/samples/dragimag/dragimag_vc9.vcproj
index f9cbaeab2d816c50922642e9435976bd72da9a06..6be15e535ffcb992c02075d2bbd5066ab2d53b78 100644 (file)
--- a/samples/dragimag/dragimag_vc9.vcproj
+++ b/samples/dragimag/dragimag_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\dragimag.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc
index 6b5d60c553d8e030fac742912a23e9af7a8bf4ea..756286797db6847fc5c4e52a81e5703d74675aeb 100644 (file)
--- a/samples/dragimag/makefile.bcc
+++ b/samples/dragimag/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAGIMAG_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DRAGIMAG_OBJECTS =  \\r
-       $(OBJS)\dragimag_dragimag.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dragimag.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe\r
-       -if exist $(OBJS)\dragimag.tds del $(OBJS)\dragimag.tds\r
-       -if exist $(OBJS)\dragimag.ilc del $(OBJS)\dragimag.ilc\r
-       -if exist $(OBJS)\dragimag.ild del $(OBJS)\dragimag.ild\r
-       -if exist $(OBJS)\dragimag.ilf del $(OBJS)\dragimag.ilf\r
-       -if exist $(OBJS)\dragimag.ils del $(OBJS)\dragimag.ils\r
-\r
-$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS)  $(OBJS)\dragimag_dragimag.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DRAGIMAG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dragimag_dragimag.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp\r
-       $(CXX) -q -c -P -o$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp\r
-\r
-$(OBJS)\dragimag_dragimag.res: .\dragimag.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dragimag.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAGIMAG_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DRAGIMAG_OBJECTS =  \
+       $(OBJS)\dragimag_dragimag.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dragimag.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
+       -if exist $(OBJS)\dragimag.tds del $(OBJS)\dragimag.tds
+       -if exist $(OBJS)\dragimag.ilc del $(OBJS)\dragimag.ilc
+       -if exist $(OBJS)\dragimag.ild del $(OBJS)\dragimag.ild
+       -if exist $(OBJS)\dragimag.ilf del $(OBJS)\dragimag.ilf
+       -if exist $(OBJS)\dragimag.ils del $(OBJS)\dragimag.ils
+
+$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS)  $(OBJS)\dragimag_dragimag.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DRAGIMAG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dragimag_dragimag.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp
+       $(CXX) -q -c -P -o$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp
+
+$(OBJS)\dragimag_dragimag.res: .\dragimag.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dragimag.rc
+

diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc
index e44dcc4bf0dd81576320f6c09c309b5640cc6d8b..d42a9464b8f93bf6db4cae891187a7781610a605 100644 (file)
--- a/samples/dragimag/makefile.gcc
+++ b/samples/dragimag/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAGIMAG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DRAGIMAG_OBJECTS =  \\r
-       $(OBJS)\dragimag_dragimag.o \\r
-       $(OBJS)\dragimag_dragimag_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dragimag.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe\r
-\r
-$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o\r
-       $(CXX) -o $@ $(DRAGIMAG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\dragimag_dragimag.o: ./dragimag.cpp\r
-       $(CXX) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\dragimag_dragimag_rc.o: ./dragimag.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAGIMAG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DRAGIMAG_OBJECTS =  \
+       $(OBJS)\dragimag_dragimag.o \
+       $(OBJS)\dragimag_dragimag_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dragimag.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
+
+$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o
+       $(CXX) -o $@ $(DRAGIMAG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\dragimag_dragimag.o: ./dragimag.cpp
+       $(CXX) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\dragimag_dragimag_rc.o: ./dragimag.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx
index 649f3a3cd261eb47ff97e222c671f3ae3ac1a590..f164fcc8b21096a2f7c4d693089de4f303c33ee8 100644 (file)
--- a/samples/dragimag/makefile.unx
+++ b/samples/dragimag/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc
index 3a622206ea010a278a80fa05774a6d296fd44005..193fdf5d0bc31aed8a0023d8a530d0e427a90b78 100644 (file)
--- a/samples/dragimag/makefile.vc
+++ b/samples/dragimag/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DRAGIMAG_OBJECTS =  \\r
-       $(OBJS)\dragimag_dragimag.obj \\r
-       $(OBJS)\dragimag_dragimag.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\dragimag.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe\r
-       -if exist $(OBJS)\dragimag.ilk del $(OBJS)\dragimag.ilk\r
-       -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb\r
-\r
-$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DRAGIMAG_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp\r
-\r
-$(OBJS)\dragimag_dragimag.res: .\dragimag.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dragimag.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DRAGIMAG_OBJECTS =  \
+       $(OBJS)\dragimag_dragimag.obj
+DRAGIMAG_RESOURCES =  \
+       $(OBJS)\dragimag_dragimag.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dragimag.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
+       -if exist $(OBJS)\dragimag.ilk del $(OBJS)\dragimag.ilk
+       -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb
+
+$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DRAGIMAG_OBJECTS) $(DRAGIMAG_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp
+
+$(OBJS)\dragimag_dragimag.res: .\dragimag.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dragimag.rc
+

diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat
index a28c89109867bc088e40fe9fce1dbe94f7253923..7a3f3208ca96c9bc72b0d7e07248d8167e2bea38 100644 (file)
--- a/samples/dragimag/makefile.wat
+++ b/samples/dragimag/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DRAGIMAG_OBJECTS =  &\r
-       $(OBJS)\dragimag_dragimag.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\dragimag.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe\r
-\r
-$(OBJS)\dragimag.exe :  $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res\r
-       @%create $(OBJS)\dragimag.lbc\r
-       @%append $(OBJS)\dragimag.lbc option quiet\r
-       @%append $(OBJS)\dragimag.lbc name $^@\r
-       @%append $(OBJS)\dragimag.lbc option caseexact\r
-       @%append $(OBJS)\dragimag.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dragimag.lbc library %i\r
-       @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res\r
-       @for %i in () do @%append $(OBJS)\dragimag.lbc option stack=%i\r
-       wlink @$(OBJS)\dragimag.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\dragimag_dragimag.obj :  .AUTODEPEND .\dragimag.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $<\r
-\r
-$(OBJS)\dragimag_dragimag.res :  .AUTODEPEND .\dragimag.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DRAGIMAG_OBJECTS =  &
+       $(OBJS)\dragimag_dragimag.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\dragimag.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
+
+$(OBJS)\dragimag.exe :  $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res
+       @%create $(OBJS)\dragimag.lbc
+       @%append $(OBJS)\dragimag.lbc option quiet
+       @%append $(OBJS)\dragimag.lbc name $^@
+       @%append $(OBJS)\dragimag.lbc option caseexact
+       @%append $(OBJS)\dragimag.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dragimag.lbc library %i
+       @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res
+       @for %i in () do @%append $(OBJS)\dragimag.lbc option stack=%i
+       wlink @$(OBJS)\dragimag.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\dragimag_dragimag.obj :  .AUTODEPEND .\dragimag.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $<
+
+$(OBJS)\dragimag_dragimag.res :  .AUTODEPEND .\dragimag.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index b15595575f9a4279c56497070f32018ca6404a14..5c31909c5b85161ff40c7fccc65a63b24f3bd890 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/drawing/drawing.dsp b/samples/drawing/drawing.dsp
index 8adc4e27a356635eacbfd11cf9dfb16bc2538ab6..e75526cbc93b777add91f75f32217316eb6c64a0 100644 (file)
--- a/samples/drawing/drawing.dsp
+++ b/samples/drawing/drawing.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\drawing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\drawing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\drawing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\drawing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj
index 0676fd7f755852a6fca90ebbd0cb6ac7ca145914..68bdce7375f1ec573e5097a418c136af0f1d3de1 100644 (file)
--- a/samples/drawing/drawing_vc7.vcproj
+++ b/samples/drawing/drawing_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\drawing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\drawing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\drawing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\drawing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj
index ea46c49dc96019b895d786cfb340e72f0ceea525..3cc63ca3aa3c6fd35f26a8a3958fd15461b898b4 100644 (file)
--- a/samples/drawing/drawing_vc8.vcproj
+++ b/samples/drawing/drawing_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj
index 02635a5099a39c263fd507ef62599c8d4e909520..52307d05d485629d469b30593e12112b0e79690f 100644 (file)
--- a/samples/drawing/drawing_vc9.vcproj
+++ b/samples/drawing/drawing_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\drawing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\drawing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index dc7847d789d2401da59be5b622b04c50f60081ca..1a09c94fe751d177fc4430217394d2d8512954fe 100644 (file)
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAWING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-DRAWING_OBJECTS =  \\r
-       $(OBJS)\drawing_drawing.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\drawing.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
-       -if exist $(OBJS)\drawing.tds del $(OBJS)\drawing.tds\r
-       -if exist $(OBJS)\drawing.ilc del $(OBJS)\drawing.ilc\r
-       -if exist $(OBJS)\drawing.ild del $(OBJS)\drawing.ild\r
-       -if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf\r
-       -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils\r
-\r
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS)  $(OBJS)\drawing_drawing.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_drawing.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\drawing_drawing.obj: .\drawing.cpp\r
-       $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
-\r
-$(OBJS)\drawing_drawing.res: .\drawing.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\drawing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAWING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DRAWING_OBJECTS =  \
+       $(OBJS)\drawing_drawing.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\drawing.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
+       -if exist $(OBJS)\drawing.tds del $(OBJS)\drawing.tds
+       -if exist $(OBJS)\drawing.ilc del $(OBJS)\drawing.ilc
+       -if exist $(OBJS)\drawing.ild del $(OBJS)\drawing.ild
+       -if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf
+       -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils
+
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS)  $(OBJS)\drawing_drawing.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_drawing.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\drawing_drawing.obj: .\drawing.cpp
+       $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp
+
+$(OBJS)\drawing_drawing.res: .\drawing.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\drawing.rc
+

diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 33ef541ba26cc83d890e894e0f49cbe711d2728a..2e56f685d8285191c238de0742a3df4854c11aac 100644 (file)
--- a/samples/drawing/makefile.gcc
+++ b/samples/drawing/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-DRAWING_OBJECTS =  \\r
-       $(OBJS)\drawing_drawing.o \\r
-       $(OBJS)\drawing_drawing_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\drawing.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
-\r
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o\r
-       $(CXX) -o $@ $(DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\drawing_drawing.o: ./drawing.cpp\r
-       $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\drawing_drawing_rc.o: ./drawing.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+DRAWING_OBJECTS =  \
+       $(OBJS)\drawing_drawing.o \
+       $(OBJS)\drawing_drawing_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\drawing.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
+
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o
+       $(CXX) -o $@ $(DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\drawing_drawing.o: ./drawing.cpp
+       $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\drawing_drawing_rc.o: ./drawing.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx
index 56cf02234aeb394a4f2424e7946c9c12d78da18e..31b36ebc7b6b3e508eed4f4917783d0b8f143e79 100644 (file)
--- a/samples/drawing/makefile.unx
+++ b/samples/drawing/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index d83418b436fe4dcbc91f7d7995e32a21ba76ae9c..d133ac00dae5eb66d3696e7ffe1b316b12f1663a 100644 (file)
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-DRAWING_OBJECTS =  \\r
-       $(OBJS)\drawing_drawing.obj \\r
-       $(OBJS)\drawing_drawing.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\drawing.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
-       -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk\r
-       -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb\r
-\r
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(DRAWING_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\drawing_drawing.obj: .\drawing.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
-\r
-$(OBJS)\drawing_drawing.res: .\drawing.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+DRAWING_OBJECTS =  \
+       $(OBJS)\drawing_drawing.obj
+DRAWING_RESOURCES =  \
+       $(OBJS)\drawing_drawing.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\drawing.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
+       -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk
+       -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb
+
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(DRAWING_OBJECTS) $(DRAWING_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\drawing_drawing.obj: .\drawing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp
+
+$(OBJS)\drawing_drawing.res: .\drawing.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc
+

diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index 9fd109244dfe6efde3dd8a57d8e53c53ada34cb6..0de230cbcfdd608beab61ef1378bbb2fbc1fc4d7 100644 (file)
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-DRAWING_OBJECTS =  &\r
-       $(OBJS)\drawing_drawing.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\drawing.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
-\r
-$(OBJS)\drawing.exe :  $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res\r
-       @%create $(OBJS)\drawing.lbc\r
-       @%append $(OBJS)\drawing.lbc option quiet\r
-       @%append $(OBJS)\drawing.lbc name $^@\r
-       @%append $(OBJS)\drawing.lbc option caseexact\r
-       @%append $(OBJS)\drawing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\drawing.lbc library %i\r
-       @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res\r
-       @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i\r
-       wlink @$(OBJS)\drawing.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\drawing_drawing.obj :  .AUTODEPEND .\drawing.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $<\r
-\r
-$(OBJS)\drawing_drawing.res :  .AUTODEPEND .\drawing.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+DRAWING_OBJECTS =  &
+       $(OBJS)\drawing_drawing.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\drawing.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
+
+$(OBJS)\drawing.exe :  $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
+       @%create $(OBJS)\drawing.lbc
+       @%append $(OBJS)\drawing.lbc option quiet
+       @%append $(OBJS)\drawing.lbc name $^@
+       @%append $(OBJS)\drawing.lbc option caseexact
+       @%append $(OBJS)\drawing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\drawing.lbc library %i
+       @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res
+       @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i
+       wlink @$(OBJS)\drawing.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\drawing_drawing.obj :  .AUTODEPEND .\drawing.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $<
+
+$(OBJS)\drawing_drawing.res :  .AUTODEPEND .\drawing.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 9e4d63721abf858014e255f9f5b1e96cb70ecef5..c67d4bfb365c5f993845aba392687521148c9683 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp
index 9a5249927919e6bd2a363588dc4ab2937b245706..cdc7f0f7afa5afb80e4e5bb79a2df4d1678f7106 100644 (file)
--- a/samples/erase/erase.dsp
+++ b/samples/erase/erase.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\erase"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\erase"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\erase"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\erase"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj
index 97eb2a4bd024960bf1e5e240ff69b676f4fd17f0..6210ba9884873c7f07921a77b67ee8550d897cf2 100644 (file)
--- a/samples/erase/erase_vc7.vcproj
+++ b/samples/erase/erase_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\erase.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\erase.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\erase.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\erase.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj
index 392cc8d0e2326f128b9c2c19a8fb186c88cc3751..23655b16e204088d59ea66be4ab78cabd2e92ac6 100644 (file)
--- a/samples/erase/erase_vc8.vcproj
+++ b/samples/erase/erase_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj
index 0eae15025b92f6bb70dd9352343de061d32a1567..891f3c813e7f328c954132199e1612e90a51356e 100644 (file)
--- a/samples/erase/erase_vc9.vcproj
+++ b/samples/erase/erase_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\erase.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\erase.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index 44db4cf3820b6bf7d116348c8e93fd5f8aae8deb..3649b9abb43229188339eea9a6f4da435b0b093a 100644 (file)
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ERASE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ERASE_OBJECTS =  \\r
-       $(OBJS)\erase_erase.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\erase.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
-       -if exist $(OBJS)\erase.tds del $(OBJS)\erase.tds\r
-       -if exist $(OBJS)\erase.ilc del $(OBJS)\erase.ilc\r
-       -if exist $(OBJS)\erase.ild del $(OBJS)\erase.ild\r
-       -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf\r
-       -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils\r
-\r
-$(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_erase.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_erase.res\r
-|\r
-\r
-$(OBJS)\erase_erase.obj: .\erase.cpp\r
-       $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
-\r
-$(OBJS)\erase_erase.res: .\erase.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\erase.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ERASE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ERASE_OBJECTS =  \
+       $(OBJS)\erase_erase.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\erase.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
+       -if exist $(OBJS)\erase.tds del $(OBJS)\erase.tds
+       -if exist $(OBJS)\erase.ilc del $(OBJS)\erase.ilc
+       -if exist $(OBJS)\erase.ild del $(OBJS)\erase.ild
+       -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf
+       -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils
+
+$(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_erase.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_erase.res
+|
+
+$(OBJS)\erase_erase.obj: .\erase.cpp
+       $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp
+
+$(OBJS)\erase_erase.res: .\erase.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\erase.rc
+

diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index 318bb406f8942947bdd334c80ce7f83046bb0211..383a3a04b506b365e0ebdd3a754d0b8499e13fbb 100644 (file)
--- a/samples/erase/makefile.gcc
+++ b/samples/erase/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ERASE_OBJECTS =  \\r
-       $(OBJS)\erase_erase.o \\r
-       $(OBJS)\erase_erase_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\erase.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
-\r
-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o\r
-       $(CXX) -o $@ $(ERASE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\erase_erase.o: ./erase.cpp\r
-       $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\erase_erase_rc.o: ./erase.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ERASE_OBJECTS =  \
+       $(OBJS)\erase_erase.o \
+       $(OBJS)\erase_erase_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\erase.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
+
+$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o
+       $(CXX) -o $@ $(ERASE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\erase_erase.o: ./erase.cpp
+       $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\erase_erase_rc.o: ./erase.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx
index a44887eab869ad1ef7acab61be0ba612258a0af9..3ac512d7c782e1c6418e48acfa0db744158c056f 100644 (file)
--- a/samples/erase/makefile.unx
+++ b/samples/erase/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index efc1b1adaa10975a2740117c5d3d34f067c94823..c6d12835cd469ae3843023cdd5bc18aa08b69cbc 100644 (file)
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-ERASE_OBJECTS =  \\r
-       $(OBJS)\erase_erase.obj \\r
-       $(OBJS)\erase_erase.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\erase.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
-       -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk\r
-       -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb\r
-\r
-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ERASE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\erase_erase.obj: .\erase.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
-\r
-$(OBJS)\erase_erase.res: .\erase.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ERASE_OBJECTS =  \
+       $(OBJS)\erase_erase.obj
+ERASE_RESOURCES =  \
+       $(OBJS)\erase_erase.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\erase.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
+       -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk
+       -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb
+
+$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ERASE_OBJECTS) $(ERASE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\erase_erase.obj: .\erase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp
+
+$(OBJS)\erase_erase.res: .\erase.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc
+

diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index f816499f9d6d1eaebbc02dfa40343753997e088e..170ed5dea321507fcecd6c970f73d702aa88c284 100644 (file)
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-ERASE_OBJECTS =  &\r
-       $(OBJS)\erase_erase.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\erase.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
-\r
-$(OBJS)\erase.exe :  $(ERASE_OBJECTS) $(OBJS)\erase_erase.res\r
-       @%create $(OBJS)\erase.lbc\r
-       @%append $(OBJS)\erase.lbc option quiet\r
-       @%append $(OBJS)\erase.lbc name $^@\r
-       @%append $(OBJS)\erase.lbc option caseexact\r
-       @%append $(OBJS)\erase.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\erase.lbc library %i\r
-       @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res\r
-       @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i\r
-       wlink @$(OBJS)\erase.lbc\r
-\r
-$(OBJS)\erase_erase.obj :  .AUTODEPEND .\erase.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $<\r
-\r
-$(OBJS)\erase_erase.res :  .AUTODEPEND .\erase.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+ERASE_OBJECTS =  &
+       $(OBJS)\erase_erase.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\erase.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
+
+$(OBJS)\erase.exe :  $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
+       @%create $(OBJS)\erase.lbc
+       @%append $(OBJS)\erase.lbc option quiet
+       @%append $(OBJS)\erase.lbc name $^@
+       @%append $(OBJS)\erase.lbc option caseexact
+       @%append $(OBJS)\erase.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\erase.lbc library %i
+       @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res
+       @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i
+       wlink @$(OBJS)\erase.lbc
+
+$(OBJS)\erase_erase.obj :  .AUTODEPEND .\erase.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $<
+
+$(OBJS)\erase_erase.res :  .AUTODEPEND .\erase.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 54418b0adc081cae9ecd3c9c7d5d2a33363748bf..4ada72a695ffd3ad2f34cdfce00282ef31e0bc7c 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/event/event.dsp b/samples/event/event.dsp
index 3a6babfd6255893a64e56e5a62f5d3976dd4fee4..1a984aefe6e9eaeaa5c5a1e66462b28d1ed5728a 100644 (file)
--- a/samples/event/event.dsp
+++ b/samples/event/event.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\event"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\event"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\event"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\event"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj
index 631b7ccde9cb6ef2333a2c96b329f0c622a3e83a..b3012625ec0daf5f43533c6be75e1df171ef41ee 100644 (file)
--- a/samples/event/event_vc7.vcproj
+++ b/samples/event/event_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\event.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\event.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\event.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\event.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj
index ee76d24ac7ff4aca9d0ea3071e96dedc72226937..79e108cb8f40a3f135de06b18d5bc6539261aff4 100644 (file)
--- a/samples/event/event_vc8.vcproj
+++ b/samples/event/event_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj
index beb5306cfb48f56db8b11b527de37ff99c8b09c8..6575f072850a07027d148fcc3f6dc4b2a9bfb41b 100644 (file)
--- a/samples/event/event_vc9.vcproj
+++ b/samples/event/event_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\event.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\event.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index 4734eb5c21be159f9052382279dceb3f064af504..a76f891d9c5648378daf8a6a91cdc289b1a87be9 100644 (file)
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EVENT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-EVENT_OBJECTS =  \\r
-       $(OBJS)\event_event.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\event.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
-       -if exist $(OBJS)\event.tds del $(OBJS)\event.tds\r
-       -if exist $(OBJS)\event.ilc del $(OBJS)\event.ilc\r
-       -if exist $(OBJS)\event.ild del $(OBJS)\event.ild\r
-       -if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf\r
-       -if exist $(OBJS)\event.ils del $(OBJS)\event.ils\r
-\r
-$(OBJS)\event.exe: $(EVENT_OBJECTS)  $(OBJS)\event_event.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_event.res\r
-|\r
-\r
-$(OBJS)\event_event.obj: .\event.cpp\r
-       $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp\r
-\r
-$(OBJS)\event_event.res: .\event.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\event.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EVENT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+EVENT_OBJECTS =  \
+       $(OBJS)\event_event.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\event.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe
+       -if exist $(OBJS)\event.tds del $(OBJS)\event.tds
+       -if exist $(OBJS)\event.ilc del $(OBJS)\event.ilc
+       -if exist $(OBJS)\event.ild del $(OBJS)\event.ild
+       -if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf
+       -if exist $(OBJS)\event.ils del $(OBJS)\event.ils
+
+$(OBJS)\event.exe: $(EVENT_OBJECTS)  $(OBJS)\event_event.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_event.res
+|
+
+$(OBJS)\event_event.obj: .\event.cpp
+       $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp
+
+$(OBJS)\event_event.res: .\event.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\event.rc
+

diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index d847649f023af69ed369ce5c176935962e85a41b..d34c0b327a38c251db2cf00ed48141f5c5a41070 100644 (file)
--- a/samples/event/makefile.gcc
+++ b/samples/event/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-EVENT_OBJECTS =  \\r
-       $(OBJS)\event_event.o \\r
-       $(OBJS)\event_event_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\event.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
-\r
-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o\r
-       $(CXX) -o $@ $(EVENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\event_event.o: ./event.cpp\r
-       $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\event_event_rc.o: ./event.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+EVENT_OBJECTS =  \
+       $(OBJS)\event_event.o \
+       $(OBJS)\event_event_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\event.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe
+
+$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o
+       $(CXX) -o $@ $(EVENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\event_event.o: ./event.cpp
+       $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\event_event_rc.o: ./event.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx
index bbd73966487768efca77eb392f435eaaf42f979e..5f965f2877b7c12f97a320cafd054cdeb308adbc 100644 (file)
--- a/samples/event/makefile.unx
+++ b/samples/event/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index f3391d43726b0a9cb38cd2a2efecc66d4bf09e45..94d635fc770a65b47c205f8bdb454a1d6c8346e8 100644 (file)
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-EVENT_OBJECTS =  \\r
-       $(OBJS)\event_event.obj \\r
-       $(OBJS)\event_event.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\event.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
-       -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk\r
-       -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb\r
-\r
-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(EVENT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\event_event.obj: .\event.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp\r
-\r
-$(OBJS)\event_event.res: .\event.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+EVENT_OBJECTS =  \
+       $(OBJS)\event_event.obj
+EVENT_RESOURCES =  \
+       $(OBJS)\event_event.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\event.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe
+       -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk
+       -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb
+
+$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(EVENT_OBJECTS) $(EVENT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\event_event.obj: .\event.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp
+
+$(OBJS)\event_event.res: .\event.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc
+

diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index b4f92ecab64c5802466e08e809229f5265970c49..ccd509c01f6c3b4720a383c6c889341d352f9150 100644 (file)
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-EVENT_OBJECTS =  &\r
-       $(OBJS)\event_event.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\event.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
-\r
-$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_event.res\r
-       @%create $(OBJS)\event.lbc\r
-       @%append $(OBJS)\event.lbc option quiet\r
-       @%append $(OBJS)\event.lbc name $^@\r
-       @%append $(OBJS)\event.lbc option caseexact\r
-       @%append $(OBJS)\event.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\event.lbc library %i\r
-       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res\r
-       @for %i in () do @%append $(OBJS)\event.lbc option stack=%i\r
-       wlink @$(OBJS)\event.lbc\r
-\r
-$(OBJS)\event_event.obj :  .AUTODEPEND .\event.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<\r
-\r
-$(OBJS)\event_event.res :  .AUTODEPEND .\event.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+EVENT_OBJECTS =  &
+       $(OBJS)\event_event.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\event.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\event.exe del $(OBJS)\event.exe
+
+$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_event.res
+       @%create $(OBJS)\event.lbc
+       @%append $(OBJS)\event.lbc option quiet
+       @%append $(OBJS)\event.lbc name $^@
+       @%append $(OBJS)\event.lbc option caseexact
+       @%append $(OBJS)\event.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\event.lbc library %i
+       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res
+       @for %i in () do @%append $(OBJS)\event.lbc option stack=%i
+       wlink @$(OBJS)\event.lbc
+
+$(OBJS)\event_event.obj :  .AUTODEPEND .\event.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<
+
+$(OBJS)\event_event.res :  .AUTODEPEND .\event.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index fcafe79eaa890598c348ee250a40529f491755e4..1ea0ad6bee4feb2f46c2e1e52203f917d71da05e 100644 (file)
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/except/except.dsp b/samples/except/except.dsp
index d2525783c308ec5472365fb6acf285521af5c2c3..d1c0c8cb5c810c7626922175eb4d90d624d9d16d 100644 (file)
--- a/samples/except/except.dsp
+++ b/samples/except/except.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\except"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\except"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\except"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\except"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/except/except_vc7.vcproj b/samples/except/except_vc7.vcproj
index f077d0bcc931e4195c4dc0eb58cb5b7129cf3b93..0878305df570e5ee7aa58eaed407d8bb293ce155 100644 (file)
--- a/samples/except/except_vc7.vcproj
+++ b/samples/except/except_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\except.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\except.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\except.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\except.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/except/except_vc8.vcproj b/samples/except/except_vc8.vcproj
index 71a78ec0556b4f418c1cbb802a397191f543e7b0..7b15994daafdf909a84917511670e7af802003df 100644 (file)
--- a/samples/except/except_vc8.vcproj
+++ b/samples/except/except_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/except/except_vc9.vcproj b/samples/except/except_vc9.vcproj
index 5a87c43fe12e3af9339372dd958c7086fd9ab3fb..3057d55bc1e2ccef0e9d6462ca2b018e21e71509 100644 (file)
--- a/samples/except/except_vc9.vcproj
+++ b/samples/except/except_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\except.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\except.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc
index 7e2efa2e839778694dc24cd4d19df299536ccf96..51fd8b1768b80bf09c86acafbaa4a1a65f2e510b 100644 (file)
--- a/samples/except/makefile.bcc
+++ b/samples/except/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXCEPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-EXCEPT_OBJECTS =  \\r
-       $(OBJS)\except_except.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\except.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe\r
-       -if exist $(OBJS)\except.tds del $(OBJS)\except.tds\r
-       -if exist $(OBJS)\except.ilc del $(OBJS)\except.ilc\r
-       -if exist $(OBJS)\except.ild del $(OBJS)\except.ild\r
-       -if exist $(OBJS)\except.ilf del $(OBJS)\except.ilf\r
-       -if exist $(OBJS)\except.ils del $(OBJS)\except.ils\r
-\r
-$(OBJS)\except.exe: $(EXCEPT_OBJECTS)  $(OBJS)\except_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(EXCEPT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\except_sample.res\r
-|\r
-\r
-$(OBJS)\except_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\except_except.obj: .\except.cpp\r
-       $(CXX) -q -c -P -o$@ $(EXCEPT_CXXFLAGS) .\except.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXCEPT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+EXCEPT_OBJECTS =  \
+       $(OBJS)\except_except.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\except.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe
+       -if exist $(OBJS)\except.tds del $(OBJS)\except.tds
+       -if exist $(OBJS)\except.ilc del $(OBJS)\except.ilc
+       -if exist $(OBJS)\except.ild del $(OBJS)\except.ild
+       -if exist $(OBJS)\except.ilf del $(OBJS)\except.ilf
+       -if exist $(OBJS)\except.ils del $(OBJS)\except.ils
+
+$(OBJS)\except.exe: $(EXCEPT_OBJECTS)  $(OBJS)\except_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(EXCEPT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\except_sample.res
+|
+
+$(OBJS)\except_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\except_except.obj: .\except.cpp
+       $(CXX) -q -c -P -o$@ $(EXCEPT_CXXFLAGS) .\except.cpp
+

diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc
index 3e2033a5db3767fb0ba1c15919f73e5626a97926..a3e0d65519e8b3eca7c5a7cdc687c94461d0ff9f 100644 (file)
--- a/samples/except/makefile.gcc
+++ b/samples/except/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXCEPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-EXCEPT_OBJECTS =  \\r
-       $(OBJS)\except_sample_rc.o \\r
-       $(OBJS)\except_except.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\except.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe\r
-\r
-$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample_rc.o\r
-       $(CXX) -o $@ $(EXCEPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\except_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\except_except.o: ./except.cpp\r
-       $(CXX) -c -o $@ $(EXCEPT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXCEPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+EXCEPT_OBJECTS =  \
+       $(OBJS)\except_sample_rc.o \
+       $(OBJS)\except_except.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\except.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe
+
+$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample_rc.o
+       $(CXX) -o $@ $(EXCEPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\except_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\except_except.o: ./except.cpp
+       $(CXX) -c -o $@ $(EXCEPT_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx
index ced1dda129ff3be271f4cd4aaa77f64ec5e314c5..00f9fb6bd2b08bd2608499688c40487db5f454ba 100644 (file)
--- a/samples/except/makefile.unx
+++ b/samples/except/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc
index 74ac72f77520fadc128ab4f6bb1684ce898af928..ab927c2b4d4d41b6861f8d6f3d04be69dd1598e7 100644 (file)
--- a/samples/except/makefile.vc
+++ b/samples/except/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-EXCEPT_OBJECTS =  \\r
-       $(OBJS)\except_sample.res \\r
-       $(OBJS)\except_except.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\except.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe\r
-       -if exist $(OBJS)\except.ilk del $(OBJS)\except.ilk\r
-       -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb\r
-\r
-$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(EXCEPT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\except_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\except_except.obj: .\except.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(EXCEPT_CXXFLAGS) .\except.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+EXCEPT_OBJECTS =  \
+       $(OBJS)\except_except.obj
+EXCEPT_RESOURCES =  \
+       $(OBJS)\except_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\except.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe
+       -if exist $(OBJS)\except.ilk del $(OBJS)\except.ilk
+       -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb
+
+$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(EXCEPT_OBJECTS) $(EXCEPT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\except_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\except_except.obj: .\except.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(EXCEPT_CXXFLAGS) .\except.cpp
+

diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat
index 344d2865bef4ec311917bc22072c873db11fb208..0e26ec2a19986f22998d9b76ebef36fee49f03ef 100644 (file)
--- a/samples/except/makefile.wat
+++ b/samples/except/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-EXCEPT_OBJECTS =  &\r
-       $(OBJS)\except_except.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\except.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe\r
-\r
-$(OBJS)\except.exe :  $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res\r
-       @%create $(OBJS)\except.lbc\r
-       @%append $(OBJS)\except.lbc option quiet\r
-       @%append $(OBJS)\except.lbc name $^@\r
-       @%append $(OBJS)\except.lbc option caseexact\r
-       @%append $(OBJS)\except.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\except.lbc library %i\r
-       @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res\r
-       @for %i in () do @%append $(OBJS)\except.lbc option stack=%i\r
-       wlink @$(OBJS)\except.lbc\r
-\r
-$(OBJS)\except_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\except_except.obj :  .AUTODEPEND .\except.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+EXCEPT_OBJECTS =  &
+       $(OBJS)\except_except.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\except.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\except.exe del $(OBJS)\except.exe
+
+$(OBJS)\except.exe :  $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res
+       @%create $(OBJS)\except.lbc
+       @%append $(OBJS)\except.lbc option quiet
+       @%append $(OBJS)\except.lbc name $^@
+       @%append $(OBJS)\except.lbc option caseexact
+       @%append $(OBJS)\except.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\except.lbc library %i
+       @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res
+       @for %i in () do @%append $(OBJS)\except.lbc option stack=%i
+       wlink @$(OBJS)\except.lbc
+
+$(OBJS)\except_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\except_except.obj :  .AUTODEPEND .\except.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $<
+

diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index dc19379048b10e2eacbd52f8ee741d61d115ccb3..c97f1433d6c47261b508d1932a1d7c234711e8cf 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/exec/exec.dsp b/samples/exec/exec.dsp
index 5f084e303b2d181a10c13961e5da341a884d0a29..5323ba1625d2aa3f4b235e45ad42943c877007df 100644 (file)
--- a/samples/exec/exec.dsp
+++ b/samples/exec/exec.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\exec"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\exec"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\exec"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\exec"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj
index 7f783ea19e9baad39cc112e340bfe6356108f528..b4b1c5a19d9766d23c125935bd8dbf44cabd6f7f 100644 (file)
--- a/samples/exec/exec_vc7.vcproj
+++ b/samples/exec/exec_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\exec.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\exec.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\exec.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\exec.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj
index 20b981cf569ab23cc9a5f82f2cd8e6055a975256..3703307293cbe5aa2c3f6e216b597f84bfb2d180 100644 (file)
--- a/samples/exec/exec_vc8.vcproj
+++ b/samples/exec/exec_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/exec/exec_vc9.vcproj b/samples/exec/exec_vc9.vcproj
index 432127b92ffbb6f4b663db30a955a0526d3e979d..cb6b5765320d6053e67dc34c2aece9f5ab868492 100644 (file)
--- a/samples/exec/exec_vc9.vcproj
+++ b/samples/exec/exec_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\exec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\exec.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc
index c307b93d4b60f23fbf9bb913ef823439bcb4a960..91620e3e26d36d8e8f5a51ec2035113be3a062f0 100644 (file)
--- a/samples/exec/makefile.bcc
+++ b/samples/exec/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXEC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-EXEC_OBJECTS =  \\r
-       $(OBJS)\exec_exec.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\exec.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe\r
-       -if exist $(OBJS)\exec.tds del $(OBJS)\exec.tds\r
-       -if exist $(OBJS)\exec.ilc del $(OBJS)\exec.ilc\r
-       -if exist $(OBJS)\exec.ild del $(OBJS)\exec.ild\r
-       -if exist $(OBJS)\exec.ilf del $(OBJS)\exec.ilf\r
-       -if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils\r
-\r
-$(OBJS)\exec.exe: $(EXEC_OBJECTS)  $(OBJS)\exec_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(EXEC_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res\r
-|\r
-\r
-$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\exec_exec.obj: .\exec.cpp\r
-       $(CXX) -q -c -P -o$@ $(EXEC_CXXFLAGS) .\exec.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXEC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+EXEC_OBJECTS =  \
+       $(OBJS)\exec_exec.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\exec.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
+       -if exist $(OBJS)\exec.tds del $(OBJS)\exec.tds
+       -if exist $(OBJS)\exec.ilc del $(OBJS)\exec.ilc
+       -if exist $(OBJS)\exec.ild del $(OBJS)\exec.ild
+       -if exist $(OBJS)\exec.ilf del $(OBJS)\exec.ilf
+       -if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils
+
+$(OBJS)\exec.exe: $(EXEC_OBJECTS)  $(OBJS)\exec_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(EXEC_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res
+|
+
+$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\exec_exec.obj: .\exec.cpp
+       $(CXX) -q -c -P -o$@ $(EXEC_CXXFLAGS) .\exec.cpp
+

diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index 314dc2a5f061155755e2687cb9be061b3209c700..7792d345ce63df27a12a2d90b8a40d56f93e8872 100644 (file)
--- a/samples/exec/makefile.gcc
+++ b/samples/exec/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXEC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-EXEC_OBJECTS =  \\r
-       $(OBJS)\exec_sample_rc.o \\r
-       $(OBJS)\exec_exec.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\exec.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe\r
-\r
-$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o\r
-       $(CXX) -o $@ $(EXEC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\exec_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\exec_exec.o: ./exec.cpp\r
-       $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXEC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+EXEC_OBJECTS =  \
+       $(OBJS)\exec_sample_rc.o \
+       $(OBJS)\exec_exec.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\exec.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
+
+$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o
+       $(CXX) -o $@ $(EXEC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\exec_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\exec_exec.o: ./exec.cpp
+       $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx
index 7b4a7703d3b6b70448506d1e6ec0499b02b9ec3c..501a0ecc97dbb4fbcc7bee970bbce08b0cb1a1e3 100644 (file)
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index 1b1c95b1d764b919e3aefc64262c4d34841433c8..ceaa72d6dd21efbef4dcb62aa33e4e0b6382a81b 100644 (file)
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-EXEC_OBJECTS =  \\r
-       $(OBJS)\exec_sample.res \\r
-       $(OBJS)\exec_exec.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\exec.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe\r
-       -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk\r
-       -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb\r
-\r
-$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(EXEC_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\exec_exec.obj: .\exec.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+EXEC_OBJECTS =  \
+       $(OBJS)\exec_exec.obj
+EXEC_RESOURCES =  \
+       $(OBJS)\exec_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\exec.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
+       -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk
+       -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb
+
+$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(EXEC_OBJECTS) $(EXEC_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\exec_exec.obj: .\exec.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp
+

diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat
index d5c0597fac5d7a3327febe6ca8b7121555796041..cb5554a4dc0c4d8fc80c9b5049722e98f90d881c 100644 (file)
--- a/samples/exec/makefile.wat
+++ b/samples/exec/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-EXEC_OBJECTS =  &\r
-       $(OBJS)\exec_exec.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\exec.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe\r
-\r
-$(OBJS)\exec.exe :  $(EXEC_OBJECTS) $(OBJS)\exec_sample.res\r
-       @%create $(OBJS)\exec.lbc\r
-       @%append $(OBJS)\exec.lbc option quiet\r
-       @%append $(OBJS)\exec.lbc name $^@\r
-       @%append $(OBJS)\exec.lbc option caseexact\r
-       @%append $(OBJS)\exec.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\exec.lbc library %i\r
-       @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res\r
-       @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i\r
-       wlink @$(OBJS)\exec.lbc\r
-\r
-$(OBJS)\exec_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\exec_exec.obj :  .AUTODEPEND .\exec.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+EXEC_OBJECTS =  &
+       $(OBJS)\exec_exec.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\exec.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
+
+$(OBJS)\exec.exe :  $(EXEC_OBJECTS) $(OBJS)\exec_sample.res
+       @%create $(OBJS)\exec.lbc
+       @%append $(OBJS)\exec.lbc option quiet
+       @%append $(OBJS)\exec.lbc name $^@
+       @%append $(OBJS)\exec.lbc option caseexact
+       @%append $(OBJS)\exec.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\exec.lbc library %i
+       @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res
+       @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i
+       wlink @$(OBJS)\exec.lbc
+
+$(OBJS)\exec_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\exec_exec.obj :  .AUTODEPEND .\exec.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $<
+

diff --git a/samples/flash/flash.dsp b/samples/flash/flash.dsp
index 2e69c9893160ae0e684eced024a85c9d3eb63e93..d57c21cda041214e4697b21f3975d8c477390b8e 100644 (file)
--- a/samples/flash/flash.dsp
+++ b/samples/flash/flash.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\flash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\flash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\flash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\flash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/flash/flash_vc7.vcproj b/samples/flash/flash_vc7.vcproj
index 7e0054d9c688284aafc864165fa37918a10c0447..ae40e1a68db96a3f137cf0b89481c80a0ead01d8 100644 (file)
--- a/samples/flash/flash_vc7.vcproj
+++ b/samples/flash/flash_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\flash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\flash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\flash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\flash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/flash/flash_vc8.vcproj b/samples/flash/flash_vc8.vcproj
index 931df7c427641d793dbf39ffbf443c36889ee805..47bcb4496e3617c8b163d45030e0cd4c684000f5 100644 (file)
--- a/samples/flash/flash_vc8.vcproj
+++ b/samples/flash/flash_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/flash/flash_vc9.vcproj b/samples/flash/flash_vc9.vcproj
index e714c3e0826cf95968da6e41b3c09e033205e4d8..31535c360aea01708682c38fc8a0f3b2524f7f5e 100644 (file)
--- a/samples/flash/flash_vc9.vcproj
+++ b/samples/flash/flash_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\flash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\flash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc
index 7881b23766da8def34469ceb88292906a550b10d..b7882911d4e7667d4d591b1f5154fbfa7722d8a6 100644 (file)
--- a/samples/flash/makefile.vc
+++ b/samples/flash/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-FLASH_OBJECTS =  \\r
-       $(OBJS)\flash_sample.res \\r
-       $(OBJS)\flash_flash.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\flash.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\flash.exe del $(OBJS)\flash.exe\r
-       -if exist $(OBJS)\flash.ilk del $(OBJS)\flash.ilk\r
-       -if exist $(OBJS)\flash.pdb del $(OBJS)\flash.pdb\r
-\r
-$(OBJS)\flash.exe: $(FLASH_OBJECTS) $(OBJS)\flash_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(FLASH_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\flash_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\flash_flash.obj: .\flash.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FLASH_CXXFLAGS) .\flash.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+FLASH_OBJECTS =  \
+       $(OBJS)\flash_flash.obj
+FLASH_RESOURCES =  \
+       $(OBJS)\flash_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\flash.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\flash.exe del $(OBJS)\flash.exe
+       -if exist $(OBJS)\flash.ilk del $(OBJS)\flash.ilk
+       -if exist $(OBJS)\flash.pdb del $(OBJS)\flash.pdb
+
+$(OBJS)\flash.exe: $(FLASH_OBJECTS) $(OBJS)\flash_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(FLASH_OBJECTS) $(FLASH_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\flash_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\flash_flash.obj: .\flash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FLASH_CXXFLAGS) .\flash.cpp
+

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index d42f2de05ebc2cd2cd002bdf5e2f21faf1269f1b..e26246d6b273fa8537bed4b4c19db955a09d9035 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/font/font.dsp b/samples/font/font.dsp
index ec59356851d56eec8082a4f06c14a491444d7973..f03f3975ec7105bdc0e8b1d490fd44166e7fb3a1 100644 (file)
--- a/samples/font/font.dsp
+++ b/samples/font/font.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\font"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\font"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\font"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\font"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj
index fa92d9b71237e68dd06f1eda5d4d7bc3b47ebcc1..176d98bd449e5ac0bd2a07feb29022c8a61b1ba4 100644 (file)
--- a/samples/font/font_vc7.vcproj
+++ b/samples/font/font_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\font.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\font.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\font.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\font.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj
index bde88569af078dda854c9ab540b650d5766858c3..7a06da78cd7fd6ece66affcfb12f56214f7f4d89 100644 (file)
--- a/samples/font/font_vc8.vcproj
+++ b/samples/font/font_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj
index 937d69bdb0685ae664c2b52069ba6c76fc127608..39ea76b2e4b05d78232457f7f423c8304765fa37 100644 (file)
--- a/samples/font/font_vc9.vcproj
+++ b/samples/font/font_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\font.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\font.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index a4cc66b7c027a0c34815997ad18dc720d744ff5c..58b5ee5c7552a56b6ff75bfd4a3e7e6bb66d69a5 100644 (file)
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FONT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-FONT_OBJECTS =  \\r
-       $(OBJS)\font_font.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\font.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
-       -if exist $(OBJS)\font.tds del $(OBJS)\font.tds\r
-       -if exist $(OBJS)\font.ilc del $(OBJS)\font.ilc\r
-       -if exist $(OBJS)\font.ild del $(OBJS)\font.ild\r
-       -if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf\r
-       -if exist $(OBJS)\font.ils del $(OBJS)\font.ils\r
-\r
-$(OBJS)\font.exe: $(FONT_OBJECTS)  $(OBJS)\font_font.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_font.res\r
-|\r
-\r
-$(OBJS)\font_font.obj: .\font.cpp\r
-       $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp\r
-\r
-$(OBJS)\font_font.res: .\font.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\font.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FONT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+FONT_OBJECTS =  \
+       $(OBJS)\font_font.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\font.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
+       -if exist $(OBJS)\font.tds del $(OBJS)\font.tds
+       -if exist $(OBJS)\font.ilc del $(OBJS)\font.ilc
+       -if exist $(OBJS)\font.ild del $(OBJS)\font.ild
+       -if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf
+       -if exist $(OBJS)\font.ils del $(OBJS)\font.ils
+
+$(OBJS)\font.exe: $(FONT_OBJECTS)  $(OBJS)\font_font.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_font.res
+|
+
+$(OBJS)\font_font.obj: .\font.cpp
+       $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp
+
+$(OBJS)\font_font.res: .\font.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\font.rc
+

diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 6c02b8d8c7f6110d74b557fde58b6e5feaadbff4..79dc6857cc715442739c5f0b966303aadf0029a5 100644 (file)
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FONT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-FONT_OBJECTS =  \\r
-       $(OBJS)\font_font.o \\r
-       $(OBJS)\font_font_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\font.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
-\r
-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o\r
-       $(CXX) -o $@ $(FONT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\font_font.o: ./font.cpp\r
-       $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\font_font_rc.o: ./font.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FONT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+FONT_OBJECTS =  \
+       $(OBJS)\font_font.o \
+       $(OBJS)\font_font_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\font.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
+
+$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o
+       $(CXX) -o $@ $(FONT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\font_font.o: ./font.cpp
+       $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\font_font_rc.o: ./font.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx
index 5fcb801897380f60de265181720f18b9469aa79f..d732c1a362467370944482a82699535cad5079d2 100644 (file)
--- a/samples/font/makefile.unx
+++ b/samples/font/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 7b7c277ddce109f1403c695afcbfcb7c2ed552c2..02261ce63c5b0be645a2680ba5ce4ab0421e7f2b 100644 (file)
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-FONT_OBJECTS =  \\r
-       $(OBJS)\font_font.obj \\r
-       $(OBJS)\font_font.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\font.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
-       -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk\r
-       -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb\r
-\r
-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(FONT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\font_font.obj: .\font.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp\r
-\r
-$(OBJS)\font_font.res: .\font.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+FONT_OBJECTS =  \
+       $(OBJS)\font_font.obj
+FONT_RESOURCES =  \
+       $(OBJS)\font_font.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\font.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
+       -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk
+       -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb
+
+$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(FONT_OBJECTS) $(FONT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\font_font.obj: .\font.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp
+
+$(OBJS)\font_font.res: .\font.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc
+

diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index 613ca97ea9b20c1ccddabfefee40b32c4ae6abc4..89ffec0405bc739bc71899ca614964bc3a24ff01 100644 (file)
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-FONT_OBJECTS =  &\r
-       $(OBJS)\font_font.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\font.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
-\r
-$(OBJS)\font.exe :  $(FONT_OBJECTS) $(OBJS)\font_font.res\r
-       @%create $(OBJS)\font.lbc\r
-       @%append $(OBJS)\font.lbc option quiet\r
-       @%append $(OBJS)\font.lbc name $^@\r
-       @%append $(OBJS)\font.lbc option caseexact\r
-       @%append $(OBJS)\font.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\font.lbc library %i\r
-       @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res\r
-       @for %i in () do @%append $(OBJS)\font.lbc option stack=%i\r
-       wlink @$(OBJS)\font.lbc\r
-\r
-$(OBJS)\font_font.obj :  .AUTODEPEND .\font.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $<\r
-\r
-$(OBJS)\font_font.res :  .AUTODEPEND .\font.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+FONT_OBJECTS =  &
+       $(OBJS)\font_font.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\font.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
+
+$(OBJS)\font.exe :  $(FONT_OBJECTS) $(OBJS)\font_font.res
+       @%create $(OBJS)\font.lbc
+       @%append $(OBJS)\font.lbc option quiet
+       @%append $(OBJS)\font.lbc name $^@
+       @%append $(OBJS)\font.lbc option caseexact
+       @%append $(OBJS)\font.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\font.lbc library %i
+       @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res
+       @for %i in () do @%append $(OBJS)\font.lbc option stack=%i
+       wlink @$(OBJS)\font.lbc
+
+$(OBJS)\font_font.obj :  .AUTODEPEND .\font.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $<
+
+$(OBJS)\font_font.res :  .AUTODEPEND .\font.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index f3c773d17f2002585795326064178e67f31a37b9..36d06948f3aeaccba31029cce67f0a83bbec29cd 100644 (file)
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -38,7 +38,7 @@ wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 
-DESTDIR =
+DESTDIR = 
 WX_RELEASE = 2.9
 WX_VERSION = $(WX_RELEASE).1
 LIBDIRNAME = $(wx_top_builddir)/lib
@@ -64,7 +64,7 @@ FSWATCHER_OBJECTS =  \
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__fswatcher___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__fswatcher___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL fswatcher$(EXEEXT)
@@ -131,13 +131,13 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
 
 all: fswatcher$(EXEEXT) $(__fswatcher_bundle___depname)
 
-install:
+install: 
 
-uninstall:
+uninstall: 
 
 install-strip: install
 
-clean:
+clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f fswatcher$(EXEEXT)
@@ -148,7 +148,7 @@ distclean: clean
 
 fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc)
        $(CXX) -o $@ $(FSWATCHER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-
+       
        $(__fswatcher___mac_setfilecmd)
        $(__fswatcher___os2_emxbindcmd)
 
@@ -156,20 +156,20 @@ fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc)
 @COND_PLATFORM_MACOSX_1@       mkdir -p fswatcher.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p fswatcher.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p fswatcher.app/Contents/Resources
-@COND_PLATFORM_MACOSX_1@
-@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/fswatcher/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >fswatcher.app/Contents/Info.plist
-@COND_PLATFORM_MACOSX_1@
-@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >fswatcher.app/Contents/PkgInfo
-@COND_PLATFORM_MACOSX_1@
-@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f fswatcher$(EXEEXT) fswatcher.app/Contents/MacOS/fswatcher
-@COND_PLATFORM_MACOSX_1@
-@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fswatcher.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fswatcher_bundle: $(____fswatcher_BUNDLE_TGT_REF_DEP)

diff --git a/samples/fswatcher/fswatcher.dsp b/samples/fswatcher/fswatcher.dsp
index 00c93a2ab93bfec82ced3dc877dae96cd4fc6f2a..d3deddea88f5abd7161e2d74f9c6369892f8ecf8 100644 (file)
--- a/samples/fswatcher/fswatcher.dsp
+++ b/samples/fswatcher/fswatcher.dsp
@@ -1,264 +1,264 @@
-# Microsoft Developer Studio Project File - Name="fswatcher" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fswatcher - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fswatcher.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fswatcher.mak" CFG="fswatcher - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fswatcher - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fswatcher - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fswatcher - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fswatcher - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\fswatcher"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fswatcher"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fswatcher - Win32 DLL Universal Release"
-# Name "fswatcher - Win32 DLL Universal Debug"
-# Name "fswatcher - Win32 DLL Release"
-# Name "fswatcher - Win32 DLL Debug"
-# Name "fswatcher - Win32 Universal Release"
-# Name "fswatcher - Win32 Universal Debug"
-# Name "fswatcher - Win32 Release"
-# Name "fswatcher - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fswatcher.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
+# Microsoft Developer Studio Project File - Name="fswatcher" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Application" 0x0101\r
+\r
+CFG=fswatcher - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "fswatcher.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "fswatcher.mak" CFG="fswatcher - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "fswatcher - Win32 DLL Universal Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 DLL Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 DLL Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 Universal Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 Universal Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "fswatcher - Win32 Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "fswatcher - Win32 DLL Universal Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswunivudll"\r
+# PROP BASE Intermediate_Dir "vc_mswunivudll\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswunivudll"\r
+# PROP Intermediate_Dir "vc_mswunivudll\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Universal Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswunivuddll"\r
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswunivuddll"\r
+# PROP Intermediate_Dir "vc_mswunivuddll\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswudll"\r
+# PROP BASE Intermediate_Dir "vc_mswudll\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswudll"\r
+# PROP Intermediate_Dir "vc_mswudll\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 DLL Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswuddll"\r
+# PROP BASE Intermediate_Dir "vc_mswuddll\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswuddll"\r
+# PROP Intermediate_Dir "vc_mswuddll\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 Universal Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswunivu"\r
+# PROP BASE Intermediate_Dir "vc_mswunivu\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswunivu"\r
+# PROP Intermediate_Dir "vc_mswunivu\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 Universal Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswunivud"\r
+# PROP BASE Intermediate_Dir "vc_mswunivud\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswunivud"\r
+# PROP Intermediate_Dir "vc_mswunivud\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswu"\r
+# PROP BASE Intermediate_Dir "vc_mswu\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswu"\r
+# PROP Intermediate_Dir "vc_mswu\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+\r
+!ELSEIF  "$(CFG)" == "fswatcher - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "vc_mswud"\r
+# PROP BASE Intermediate_Dir "vc_mswud\fswatcher"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "vc_mswud"\r
+# PROP Intermediate_Dir "vc_mswud\fswatcher"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
+\r
+!ENDIF\r
+\r
+# Begin Target\r
+\r
+# Name "fswatcher - Win32 DLL Universal Release"\r
+# Name "fswatcher - Win32 DLL Universal Debug"\r
+# Name "fswatcher - Win32 DLL Release"\r
+# Name "fswatcher - Win32 DLL Debug"\r
+# Name "fswatcher - Win32 Universal Release"\r
+# Name "fswatcher - Win32 Universal Debug"\r
+# Name "fswatcher - Win32 Release"\r
+# Name "fswatcher - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\fswatcher.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\..\..\samples\sample.rc\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r
+\r

diff --git a/samples/fswatcher/fswatcher_vc7.vcproj b/samples/fswatcher/fswatcher_vc7.vcproj
index a58755aad09b4278a34332c824b7eab87b56e2ce..5c1d9cbff3564deb8447ad2f62f883762602f8f4 100644 (file)
--- a/samples/fswatcher/fswatcher_vc7.vcproj
+++ b/samples/fswatcher/fswatcher_vc7.vcproj
@@ -1,553 +1,561 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<!--
-
-  This project was generated by
-  Bakefile 0.2.6 (http://www.bakefile.org)
-  Do not modify, all changes will be overwritten!
-
--->
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="fswatcher"
-       ProjectGUID="{EB3DE9E5-4B16-5606-989C-1248E69A6AA8}">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="vc_mswud"
-                       IntermediateDirectory="vc_mswud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               MinimalRebuild="TRUE"
-                               ExceptionHandling="TRUE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="vc_mswu"
-                       IntermediateDirectory="vc_mswu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="TRUE"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivud"
-                       IntermediateDirectory="vc_mswunivud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               MinimalRebuild="TRUE"
-                               ExceptionHandling="TRUE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswunivud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Universal Release|Win32"
-                       OutputDirectory="vc_mswunivu"
-                       IntermediateDirectory="vc_mswunivu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="TRUE"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswunivu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="DLL Debug|Win32"
-                       OutputDirectory="vc_mswuddll"
-                       IntermediateDirectory="vc_mswuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               MinimalRebuild="TRUE"
-                               ExceptionHandling="TRUE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="DLL Release|Win32"
-                       OutputDirectory="vc_mswudll"
-                       IntermediateDirectory="vc_mswudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="TRUE"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivuddll"
-                       IntermediateDirectory="vc_mswunivuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               MinimalRebuild="TRUE"
-                               ExceptionHandling="TRUE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="TRUE"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswunivuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Release|Win32"
-                       OutputDirectory="vc_mswunivudll"
-                       IntermediateDirectory="vc_mswunivudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="TRUE"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="TRUE"
-                               ObjectFile="vc_mswunivudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="TRUE"
-                               Detect64BitPortabilityProblems="TRUE"
-                               DebugInformationFormat="3"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                       <File
-                               RelativePath=".\fswatcher.cpp">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-                       <File
-                               RelativePath="..\..\samples\sample.rc">
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-
-       </Globals>
-</VisualStudioProject>
-
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<!--\r
+\r
+  This project was generated by\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
+  Do not modify, all changes will be overwritten!\r
+\r
+-->\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="fswatcher"\r
+       ProjectGUID="{EB3DE9E5-4B16-5606-989C-1248E69A6AA8}">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+               \r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath=".\fswatcher.cpp">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
+                       <File\r
+                               RelativePath="..\..\samples\sample.rc">\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+               \r
+       </Globals>\r
+</VisualStudioProject>\r
+\r

diff --git a/samples/fswatcher/fswatcher_vc8.vcproj b/samples/fswatcher/fswatcher_vc8.vcproj
index 4f50ad2a70eb3f8ec39dd2eeb6a24d0c9885a82b..b81baee90d87cd63554e19267ee521e40d367a71 100644 (file)
--- a/samples/fswatcher/fswatcher_vc8.vcproj
+++ b/samples/fswatcher/fswatcher_vc8.vcproj
@@ -1,818 +1,826 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<!--
-
-  This project was generated by
-  Bakefile 0.2.6 (http://www.bakefile.org)
-  Do not modify, all changes will be overwritten!
-
--->
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="fswatcher"
-       ProjectGUID="{435450E4-AF01-5A41-A82B-3604C248F404}"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="vc_mswud"
-                       IntermediateDirectory="vc_mswud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               MinimalRebuild="true"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswud\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="vc_mswu"
-                       IntermediateDirectory="vc_mswu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswu\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivud"
-                       IntermediateDirectory="vc_mswunivud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               MinimalRebuild="true"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivud\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Universal Release|Win32"
-                       OutputDirectory="vc_mswunivu"
-                       IntermediateDirectory="vc_mswunivu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivu\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Debug|Win32"
-                       OutputDirectory="vc_mswuddll"
-                       IntermediateDirectory="vc_mswuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               MinimalRebuild="true"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswuddll\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Release|Win32"
-                       OutputDirectory="vc_mswudll"
-                       IntermediateDirectory="vc_mswudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswudll\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivuddll"
-                       IntermediateDirectory="vc_mswunivuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               MinimalRebuild="true"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivuddll\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Release|Win32"
-                       OutputDirectory="vc_mswunivudll"
-                       IntermediateDirectory="vc_mswunivudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivudll\fswatcher_vc8.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\fswatcher.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath="..\..\samples\sample.rc"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-
-       </Globals>
-</VisualStudioProject>
-
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<!--\r
+\r
+  This project was generated by\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
+  Do not modify, all changes will be overwritten!\r
+\r
+-->\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="fswatcher"\r
+       ProjectGUID="{435450E4-AF01-5A41-A82B-3604C248F404}"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+               \r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswud\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswu\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivud\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivu\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswuddll\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswudll\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivuddll\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivudll\fswatcher_vc8.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+               \r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\fswatcher.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\samples\sample.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+               \r
+       </Globals>\r
+</VisualStudioProject>\r
+\r

diff --git a/samples/fswatcher/fswatcher_vc9.vcproj b/samples/fswatcher/fswatcher_vc9.vcproj
index 01ca5bddc5ac0715e4c0db7ed76fc03a5623530c..372fefad182a40aa20ec24a69d11b17491d94aa2 100644 (file)
--- a/samples/fswatcher/fswatcher_vc9.vcproj
+++ b/samples/fswatcher/fswatcher_vc9.vcproj
@@ -1,790 +1,798 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<!--
-
-  This project was generated by
-  Bakefile 0.2.6 (http://www.bakefile.org)
-  Do not modify, all changes will be overwritten!
-
--->
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9.00"
-       Name="fswatcher"
-       ProjectGUID="{F403332F-7F84-5BB4-ABAE-D07D36A16DAA}"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="vc_mswud"
-                       IntermediateDirectory="vc_mswud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswud\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="vc_mswu"
-                       IntermediateDirectory="vc_mswu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswu\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivud"
-                       IntermediateDirectory="vc_mswunivud\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivud\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivud\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivud\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Universal Release|Win32"
-                       OutputDirectory="vc_mswunivu"
-                       IntermediateDirectory="vc_mswunivu\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivu\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivu\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivu\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Debug|Win32"
-                       OutputDirectory="vc_mswuddll"
-                       IntermediateDirectory="vc_mswuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswuddll\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Release|Win32"
-                       OutputDirectory="vc_mswudll"
-                       IntermediateDirectory="vc_mswudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswudll\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Debug|Win32"
-                       OutputDirectory="vc_mswunivuddll"
-                       IntermediateDirectory="vc_mswunivuddll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivuddll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivuddll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivuddll\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="DLL Universal Release|Win32"
-                       OutputDirectory="vc_mswunivudll"
-                       IntermediateDirectory="vc_mswunivudll\fswatcher"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/MP"
-                               Optimization="2"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               ExceptionHandling="1"
-                               RuntimeLibrary="2"
-                               RuntimeTypeInfo="true"
-                               ObjectFile="vc_mswunivudll\fswatcher\"
-                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"
-                               WarningLevel="4"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-                               Culture="1033"
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=""
-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-                               OutputFile="vc_mswunivudll\fswatcher.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-                               GenerateManifest="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                               OutputFile="vc_mswunivudll\fswatcher_vc9.bsc"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\fswatcher.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath="..\..\samples\sample.rc"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-
-       </Globals>
-</VisualStudioProject>
-
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<!--\r
+\r
+  This project was generated by\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
+  Do not modify, all changes will be overwritten!\r
+\r
+-->\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="fswatcher"\r
+       ProjectGUID="{F403332F-7F84-5BB4-ABAE-D07D36A16DAA}"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+               \r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswud\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswu\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivud\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivud\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivud\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivud\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivu\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivu\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivu\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivu\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswuddll\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswudll\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivuddll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\fswatcher.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivuddll\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\fswatcher"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/MP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="true"\r
+                               ObjectFile="vc_mswunivudll\fswatcher\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\fswatcher.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
+                               OutputFile="vc_mswunivudll\fswatcher.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="vc_mswunivudll\fswatcher.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="vc_mswunivudll\fswatcher_vc9.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+               \r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\fswatcher.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\samples\sample.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+               \r
+       </Globals>\r
+</VisualStudioProject>\r
+\r

diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc
index e9493ab6b16a73b4ecc3ae4439f635497d2a3a55..866daacaa9bff584ffd882ef709afd19d4a032e9 100644 (file)
--- a/samples/fswatcher/makefile.bcc
+++ b/samples/fswatcher/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -64,10 +64,10 @@ LIBTYPE_SUFFIX = lib
 LIBTYPE_SUFFIX = dll
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_2 = -Od
@@ -76,13 +76,13 @@ __OPTIMIZEFLAG_2 = -Od
 __OPTIMIZEFLAG_2 = -O2
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
+__THREADSFLAG_5 = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_5 = mt
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
+__THREADSFLAG_6 = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_6 = -tWM
@@ -91,13 +91,13 @@ __THREADSFLAG_6 = -tWM
 __RUNTIME_LIBS_7 = -tWR
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
+__RUNTIME_LIBS_7 = 
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_8 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
+__RUNTIME_LIBS_8 = 
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -208,7 +208,7 @@ $(OBJS):
 
 all: $(OBJS)\fswatcher.exe
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm

diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc
index d1e2b6793c65ac6bc13e7f5fa8be6c5a779465d5..9870dc2a390fc8f9e6f1688ea9c2e65adfb8d96b 100644 (file)
--- a/samples/fswatcher/makefile.gcc
+++ b/samples/fswatcher/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -61,10 +61,10 @@ ifeq ($(SHARED),1)
 LIBTYPE_SUFFIX = dll
 endif
 ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 endif
 ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
@@ -76,13 +76,13 @@ ifeq ($(USE_RTTI),0)
 __RTTIFLAG_5 = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
+__RTTIFLAG_5 = 
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG_6 = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
+__EXCEPTIONSFLAG_6 = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -178,17 +178,17 @@ endif
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 endif
 ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
+__THREADSFLAG = 
 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
@@ -203,7 +203,7 @@ $(OBJS):
 
 all: $(OBJS)\fswatcher.exe
 
-clean:
+clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\fswatcher.exe del $(OBJS)\fswatcher.exe

diff --git a/samples/fswatcher/makefile.unx b/samples/fswatcher/makefile.unx
index bb6a65dd6ac5b7f42ee0fb3b818cefeb9e18665d..e15cb429df7b9e4329739bdec22ea4e2ad3f6161 100644 (file)
--- a/samples/fswatcher/makefile.unx
+++ b/samples/fswatcher/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -10,19 +10,19 @@
 # These are configurable options:
 # -------------------------------------------------------------------------
 
-# C++ compiler
+# C++ compiler 
 CXX = `$(WX_CONFIG) --cxx`
 
-# Standard flags for C++
-CXXFLAGS ?=
+# Standard flags for C++ 
+CXXFLAGS ?= 
 
-# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS ?=
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS ?= 
 
-# Standard linker flags
-LDFLAGS ?=
+# Standard linker flags 
+LDFLAGS ?= 
 
-# Location and arguments of wx-config script
+# Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
 # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
@@ -34,7 +34,7 @@ WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; els
 # Compile Unicode build of wxWidgets? [0,1]
 WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
 
-# Version of the wx library to build against.
+# Version of the wx library to build against. 
 WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
 
 
@@ -75,16 +75,16 @@ endif
 
 all: test_for_selected_wxbuild fswatcher
 
-install:
+install: 
 
-uninstall:
+uninstall: 
 
-clean:
+clean: 
        rm -f ./*.o
        rm -f ./*.d
        rm -f fswatcher
 
-test_for_selected_wxbuild:
+test_for_selected_wxbuild: 
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 fswatcher: $(FSWATCHER_OBJECTS)

diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc
index eefb408231582421bf42628674ad22a6d37a07d5..be8d9b06d48761f8af0d3178328488398d6ad693 100644 (file)
--- a/samples/fswatcher/makefile.vc
+++ b/samples/fswatcher/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -20,14 +20,14 @@ LIBDIRNAME = \
        .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FSWATCHER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(____DEBUGRUNTIME_2_p) \
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
-       $(CPPFLAGS) $(CXXFLAGS)
+FSWATCHER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
 FSWATCHER_OBJECTS =  \
        $(OBJS)\fswatcher_fswatcher.obj
 FSWATCHER_RESOURCES =  \
@@ -87,19 +87,19 @@ LINK_TARGET_CPU = /MACHINE:AMD64
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
+__DEBUGINFO_0 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
+__DEBUGINFO_0 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_0 = /Zi
@@ -108,79 +108,103 @@ __DEBUGINFO_0 = /Zi
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
+____DEBUGRUNTIME_3_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
+____DEBUGRUNTIME_3_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+__DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
+__DEBUGRUNTIME_4 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
+__DEBUGRUNTIME_4 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+__DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
+__DEBUGRUNTIME_5 = 
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
+__DEBUGRUNTIME_5 = 
 !endif
 !if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
+__OPTIMIZEFLAG_6 = /Od
 !endif
 !if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
+__OPTIMIZEFLAG_6 = /O2
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
+__THREADSFLAG_9 = L
 !endif
 !if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
+__THREADSFLAG_9 = T
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
+__RUNTIME_LIBS_10 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
+__RTTIFLAG_11 = 
 !endif
 !if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
+__RTTIFLAG_11 = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
+__EXCEPTIONSFLAG_12 = 
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
+__EXCEPTIONSFLAG_12 = /EHsc
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
@@ -291,7 +315,7 @@ $(OBJS):
 
 all: $(OBJS)\fswatcher.exe
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -305,7 +329,7 @@ $(OBJS)\fswatcher.exe: $(FSWATCHER_OBJECTS) $(OBJS)\fswatcher_sample.res
 <<
 
 $(OBJS)\fswatcher_sample.res: .\..\..\samples\sample.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
 
 $(OBJS)\fswatcher_fswatcher.obj: .\fswatcher.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FSWATCHER_CXXFLAGS) .\fswatcher.cpp

diff --git a/samples/fswatcher/makefile.wat b/samples/fswatcher/makefile.wat
index 2d65a1daa4200a678afa8df6f76d8c9d153d88c3..0e18d598bcfda9e4eca6b385b4d5f292c67c9597 100644 (file)
--- a/samples/fswatcher/makefile.wat
+++ b/samples/fswatcher/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -63,10 +63,10 @@ LIBTYPE_SUFFIX = dll
 !endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
@@ -93,11 +93,11 @@ __DEBUGINFO_1 = debug all
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
@@ -111,7 +111,7 @@ __OPTIMIZEFLAG_2 = -ot -ox
 !endif
 __THREADSFLAG_5 =
 !ifeq USE_THREADS 0
-__THREADSFLAG_5 =
+__THREADSFLAG_5 = 
 !endif
 !ifeq USE_THREADS 1
 __THREADSFLAG_5 = -bm
@@ -121,18 +121,18 @@ __RUNTIME_LIBS_6 =
 __RUNTIME_LIBS_6 = -br
 !endif
 !ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
+__RUNTIME_LIBS_6 = 
 !endif
 __RTTIFLAG_7 =
 !ifeq USE_RTTI 0
-__RTTIFLAG_7 =
+__RTTIFLAG_7 = 
 !endif
 !ifeq USE_RTTI 1
 __RTTIFLAG_7 = -xr
 !endif
 __EXCEPTIONSFLAG_8 =
 !ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
+__EXCEPTIONSFLAG_8 = 
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_8 = -xs
@@ -232,7 +232,7 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\fswatcher.exe
 
-clean : .SYMBOLIC
+clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 9da2dd239caf7bc5ec6436510804bf2c908bec94..4c7a110c06e2e37f18359fdb826bf52f552ea344 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/grid/grid.dsp b/samples/grid/grid.dsp
index 2490d4a69bdf9576d03b4cb8577cc3a02f1df9e6..ddae53dead2b85812a459f7931ce4ac1e56074dc 100644 (file)
--- a/samples/grid/grid.dsp
+++ b/samples/grid/grid.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\grid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\grid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\grid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\grid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj
index 2f9e56539ce6ee8cd1116e4707af5ea4af33db3d..59126cb55908b1ec38d92683f984b9fe4f8027c2 100644 (file)
--- a/samples/grid/grid_vc7.vcproj
+++ b/samples/grid/grid_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\grid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\grid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\grid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\grid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj
index 4df613d5728cd22d44df042f4137f72214096a34..7175e75b21bbc799e9c33ce00c03c7f2913a11cf 100644 (file)
--- a/samples/grid/grid_vc8.vcproj
+++ b/samples/grid/grid_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/grid/grid_vc9.vcproj b/samples/grid/grid_vc9.vcproj
index 17eb05b6a2669ec9f3e26c44ec35795fd72bca7c..7e7b94b8fc2d0f17c150a1bfb8e668497367403b 100644 (file)
--- a/samples/grid/grid_vc9.vcproj
+++ b/samples/grid/grid_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\grid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\grid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc
index 6a2d1f8e2768fd329967ffde8cdeb47b364625c0..8f582524cda2402bc297128a7c4c581f11b173c9 100644 (file)
--- a/samples/grid/makefile.bcc
+++ b/samples/grid/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-GRID_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-GRID_OBJECTS =  \\r
-       $(OBJS)\grid_griddemo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\grid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
-       -if exist $(OBJS)\grid.tds del $(OBJS)\grid.tds\r
-       -if exist $(OBJS)\grid.ilc del $(OBJS)\grid.ilc\r
-       -if exist $(OBJS)\grid.ild del $(OBJS)\grid.ild\r
-       -if exist $(OBJS)\grid.ilf del $(OBJS)\grid.ilf\r
-       -if exist $(OBJS)\grid.ils del $(OBJS)\grid.ils\r
-\r
-$(OBJS)\grid.exe: $(GRID_OBJECTS)  $(OBJS)\grid_griddemo.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_griddemo.res\r
-|\r
-\r
-$(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
-       $(CXX) -q -c -P -o$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
-\r
-$(OBJS)\grid_griddemo.res: .\griddemo.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\griddemo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+GRID_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+GRID_OBJECTS =  \
+       $(OBJS)\grid_griddemo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\grid.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
+       -if exist $(OBJS)\grid.tds del $(OBJS)\grid.tds
+       -if exist $(OBJS)\grid.ilc del $(OBJS)\grid.ilc
+       -if exist $(OBJS)\grid.ild del $(OBJS)\grid.ild
+       -if exist $(OBJS)\grid.ilf del $(OBJS)\grid.ilf
+       -if exist $(OBJS)\grid.ils del $(OBJS)\grid.ils
+
+$(OBJS)\grid.exe: $(GRID_OBJECTS)  $(OBJS)\grid_griddemo.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_griddemo.res
+|
+
+$(OBJS)\grid_griddemo.obj: .\griddemo.cpp
+       $(CXX) -q -c -P -o$@ $(GRID_CXXFLAGS) .\griddemo.cpp
+
+$(OBJS)\grid_griddemo.res: .\griddemo.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\griddemo.rc
+

diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index 79f2dd794c9b6a7d5798111d0f520e4ccd421b37..825ed5ac0661b2cc14827bb3adca9f3bc0b4c9b0 100644 (file)
--- a/samples/grid/makefile.gcc
+++ b/samples/grid/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-GRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-GRID_OBJECTS =  \\r
-       $(OBJS)\grid_griddemo.o \\r
-       $(OBJS)\grid_griddemo_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\grid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
-\r
-$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo_rc.o\r
-       $(CXX) -o $@ $(GRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\grid_griddemo.o: ./griddemo.cpp\r
-       $(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\grid_griddemo_rc.o: ./griddemo.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+GRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+GRID_OBJECTS =  \
+       $(OBJS)\grid_griddemo.o \
+       $(OBJS)\grid_griddemo_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\grid.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
+
+$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo_rc.o
+       $(CXX) -o $@ $(GRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\grid_griddemo.o: ./griddemo.cpp
+       $(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\grid_griddemo_rc.o: ./griddemo.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index a48767bcf67cbeaa670f1abadaef5e0e6e10aaf6..d1b5f0a702980852a49ef98872cbbccfb1055cb4 100644 (file)
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index f83fa071fa18a906528c40cc38b087e122a200b4..1710819052d87d300a87f97abb94507ba9278d37 100644 (file)
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-GRID_OBJECTS =  \\r
-       $(OBJS)\grid_griddemo.obj \\r
-       $(OBJS)\grid_griddemo.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\grid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
-       -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk\r
-       -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb\r
-\r
-$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(GRID_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
-\r
-$(OBJS)\grid_griddemo.res: .\griddemo.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+GRID_OBJECTS =  \
+       $(OBJS)\grid_griddemo.obj
+GRID_RESOURCES =  \
+       $(OBJS)\grid_griddemo.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\grid.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
+       -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk
+       -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb
+
+$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(GRID_OBJECTS) $(GRID_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\grid_griddemo.obj: .\griddemo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp
+
+$(OBJS)\grid_griddemo.res: .\griddemo.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc
+

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 467246ecc89a329f46e6dd8dd6b28d255a7ab696..b824d16b23a31878a3edd916dc593660852adab8 100644 (file)
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-GRID_OBJECTS =  &\r
-       $(OBJS)\grid_griddemo.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\grid.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
-\r
-$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
-       @%create $(OBJS)\grid.lbc\r
-       @%append $(OBJS)\grid.lbc option quiet\r
-       @%append $(OBJS)\grid.lbc name $^@\r
-       @%append $(OBJS)\grid.lbc option caseexact\r
-       @%append $(OBJS)\grid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\grid.lbc library %i\r
-       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res\r
-       @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i\r
-       wlink @$(OBJS)\grid.lbc\r
-\r
-$(OBJS)\grid_griddemo.obj :  .AUTODEPEND .\griddemo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $<\r
-\r
-$(OBJS)\grid_griddemo.res :  .AUTODEPEND .\griddemo.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+GRID_OBJECTS =  &
+       $(OBJS)\grid_griddemo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\grid.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
+
+$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
+       @%create $(OBJS)\grid.lbc
+       @%append $(OBJS)\grid.lbc option quiet
+       @%append $(OBJS)\grid.lbc name $^@
+       @%append $(OBJS)\grid.lbc option caseexact
+       @%append $(OBJS)\grid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\grid.lbc library %i
+       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res
+       @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i
+       wlink @$(OBJS)\grid.lbc
+
+$(OBJS)\grid_griddemo.obj :  .AUTODEPEND .\griddemo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $<
+
+$(OBJS)\grid_griddemo.res :  .AUTODEPEND .\griddemo.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 8fe91e6ea8c96f13bda120047ecbb208c8c985d0..981c17efc70f7831350153b8ba3a748c1cf41a1c 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/help/help.dsp b/samples/help/help.dsp
index 2a7bf3b3438e484bd9697524cf12ff0003c64eb2..bada8bac5fd7a3f328f895f15022b249812b1cc3 100644 (file)
--- a/samples/help/help.dsp
+++ b/samples/help/help.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\help"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\help"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\help"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\help"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj
index 4c92882d43b1b2a6c6bb741ee355e4507725e7d1..7e6f0525a516ee2b28b81370185a88ed661300d8 100644 (file)
--- a/samples/help/help_vc7.vcproj
+++ b/samples/help/help_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\help.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\help.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\help.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\help.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 538786c86dccdc575e4937a7a8a24d29a4710f9b..e4fd40ccbd1732031be07fd13cfec4eb6ce40d62 100644 (file)
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj
index f8e9b28db96d3b6f1871664aa92b3ce870d8c11a..eb7f694af83d7f754f09d313970325ee7b5073dc 100644 (file)
--- a/samples/help/help_vc9.vcproj
+++ b/samples/help/help_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\help.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\help.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index f379894d6d6bef701dc7bafeaf7bd1b969dc7250..9c4eb2ecdbe0ba9aaaca753bc7f45ac63d766fd8 100644 (file)
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HELP_OBJECTS =  \\r
-       $(OBJS)\help_demo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\help.exe data data_doc\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
-       -if exist $(OBJS)\help.tds del $(OBJS)\help.tds\r
-       -if exist $(OBJS)\help.ilc del $(OBJS)\help.ilc\r
-       -if exist $(OBJS)\help.ild del $(OBJS)\help.ild\r
-       -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf\r
-       -if exist $(OBJS)\help.ils del $(OBJS)\help.ils\r
-\r
-$(OBJS)\help.exe: $(HELP_OBJECTS)  $(OBJS)\help_demo.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_demo.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-data_doc: \r
-       if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
-       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc\r
-\r
-$(OBJS)\help_demo.obj: .\demo.cpp\r
-       $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp\r
-\r
-$(OBJS)\help_demo.res: .\demo.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\demo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HELP_OBJECTS =  \
+       $(OBJS)\help_demo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\help.exe data data_doc
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe
+       -if exist $(OBJS)\help.tds del $(OBJS)\help.tds
+       -if exist $(OBJS)\help.ilc del $(OBJS)\help.ilc
+       -if exist $(OBJS)\help.ild del $(OBJS)\help.ild
+       -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf
+       -if exist $(OBJS)\help.ils del $(OBJS)\help.ils
+
+$(OBJS)\help.exe: $(HELP_OBJECTS)  $(OBJS)\help_demo.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_demo.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+data_doc: 
+       if not exist $(OBJS)\doc mkdir $(OBJS)\doc
+       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+
+$(OBJS)\help_demo.obj: .\demo.cpp
+       $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp
+
+$(OBJS)\help_demo.res: .\demo.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\demo.rc
+

diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index c9f32252dbdc4d7d96880c0073371ba321f4ad3c..9b378de01406f8faabf19ca18f77f6b89e9169ec 100644 (file)
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -1,242 +1,242 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-HELP_OBJECTS =  \\r
-       $(OBJS)\help_demo.o \\r
-       $(OBJS)\help_demo_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\help.exe data data_doc\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
-\r
-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o\r
-       $(CXX) -o $@ $(HELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-data_doc: \r
-       if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
-       for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc\r
-\r
-$(OBJS)\help_demo.o: ./demo.cpp\r
-       $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\help_demo_rc.o: ./demo.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data data_doc\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+HELP_OBJECTS =  \
+       $(OBJS)\help_demo.o \
+       $(OBJS)\help_demo_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\help.exe data data_doc
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe
+
+$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o
+       $(CXX) -o $@ $(HELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+data_doc: 
+       if not exist $(OBJS)\doc mkdir $(OBJS)\doc
+       for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
+
+$(OBJS)\help_demo.o: ./demo.cpp
+       $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\help_demo_rc.o: ./demo.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data data_doc
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx
index b71aec8ebcabf945a746bcbde6db5c6f05f19a52..35c95f90d12ac08e445fa1ba2f7f940171702d9e 100644 (file)
--- a/samples/help/makefile.unx
+++ b/samples/help/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index c2880e99582a844ee44b2049f6cb82828d776b83..8f03846d14c25c353a0e09e69cd328e72df1601f 100644 (file)
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -1,327 +1,352 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-HELP_OBJECTS =  \\r
-       $(OBJS)\help_demo.obj \\r
-       $(OBJS)\help_demo.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\help.exe data data_doc\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
-       -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk\r
-       -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb\r
-\r
-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HELP_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-data_doc: \r
-       if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
-       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc\r
-\r
-$(OBJS)\help_demo.obj: .\demo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp\r
-\r
-$(OBJS)\help_demo.res: .\demo.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HELP_OBJECTS =  \
+       $(OBJS)\help_demo.obj
+HELP_RESOURCES =  \
+       $(OBJS)\help_demo.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\help.exe data data_doc
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe
+       -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk
+       -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb
+
+$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HELP_OBJECTS) $(HELP_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+data_doc: 
+       if not exist $(OBJS)\doc mkdir $(OBJS)\doc
+       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+
+$(OBJS)\help_demo.obj: .\demo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp
+
+$(OBJS)\help_demo.res: .\demo.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc
+

diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index e3ed859f8ac93fdd7e1b5358bff346973b28c32c..af47309f6c3973e60d977a2741ad48f0398b2d5e 100644 (file)
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -1,278 +1,278 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-HELP_OBJECTS =  &\r
-       $(OBJS)\help_demo.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\help.exe data data_doc\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
-\r
-$(OBJS)\help.exe :  $(HELP_OBJECTS) $(OBJS)\help_demo.res\r
-       @%create $(OBJS)\help.lbc\r
-       @%append $(OBJS)\help.lbc option quiet\r
-       @%append $(OBJS)\help.lbc name $^@\r
-       @%append $(OBJS)\help.lbc option caseexact\r
-       @%append $(OBJS)\help.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\help.lbc library %i\r
-       @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res\r
-       @for %i in () do @%append $(OBJS)\help.lbc option stack=%i\r
-       wlink @$(OBJS)\help.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-data_doc : .SYMBOLIC \r
-       if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
-       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc\r
-\r
-$(OBJS)\help_demo.obj :  .AUTODEPEND .\demo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $<\r
-\r
-$(OBJS)\help_demo.res :  .AUTODEPEND .\demo.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+HELP_OBJECTS =  &
+       $(OBJS)\help_demo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\help.exe data data_doc
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\help.exe del $(OBJS)\help.exe
+
+$(OBJS)\help.exe :  $(HELP_OBJECTS) $(OBJS)\help_demo.res
+       @%create $(OBJS)\help.lbc
+       @%append $(OBJS)\help.lbc option quiet
+       @%append $(OBJS)\help.lbc name $^@
+       @%append $(OBJS)\help.lbc option caseexact
+       @%append $(OBJS)\help.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\help.lbc library %i
+       @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res
+       @for %i in () do @%append $(OBJS)\help.lbc option stack=%i
+       wlink @$(OBJS)\help.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+data_doc : .SYMBOLIC 
+       if not exist $(OBJS)\doc mkdir $(OBJS)\doc
+       for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+
+$(OBJS)\help_demo.obj :  .AUTODEPEND .\demo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $<
+
+$(OBJS)\help_demo.res :  .AUTODEPEND .\demo.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 429f888d14ac11f7039b4a70605a718a994b97f8..415603adfcf9bd5aa4b914b45beb37656f0bf7e1 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/htlbox/htlbox.dsp b/samples/htlbox/htlbox.dsp
index d68df27085762a6ff39b061869352de538efc82d..10ff7753f26d9c128a94d1aa0fe9c61370755bb0 100644 (file)
--- a/samples/htlbox/htlbox.dsp
+++ b/samples/htlbox/htlbox.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\htlbox"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\htlbox"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\htlbox"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\htlbox"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj
index 0e051fb81df4b341283eb43905f5f5bab685064d..c3d2fef46113a8769833e35d5d39c4fc0a58ce68 100644 (file)
--- a/samples/htlbox/htlbox_vc7.vcproj
+++ b/samples/htlbox/htlbox_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\htlbox.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\htlbox.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\htlbox.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj
index 85017c8c9b4f6ae4f4fc07096a79f79dc36f9085..86a63e7654eed494b2827f19c67fa72ba218d5cb 100644 (file)
--- a/samples/htlbox/htlbox_vc8.vcproj
+++ b/samples/htlbox/htlbox_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj
index 1541efadbfe65c5af7bdff97482f2813f667af92..06f6f88094be39e296f808b1c17138b3113d95e2 100644 (file)
--- a/samples/htlbox/htlbox_vc9.vcproj
+++ b/samples/htlbox/htlbox_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htlbox.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index cc2d2426fb34feb5871494c34ab95cfb7489394e..dc92bc1a7b643080724b0d8041f897ddb2855c78 100644 (file)
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTLBOX_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HTLBOX_OBJECTS =  \\r
-       $(OBJS)\htlbox_htlbox.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htlbox.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
-       -if exist $(OBJS)\htlbox.tds del $(OBJS)\htlbox.tds\r
-       -if exist $(OBJS)\htlbox.ilc del $(OBJS)\htlbox.ilc\r
-       -if exist $(OBJS)\htlbox.ild del $(OBJS)\htlbox.ild\r
-       -if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf\r
-       -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils\r
-\r
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS)  $(OBJS)\htlbox_htlbox.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_htlbox.res\r
-|\r
-\r
-$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp\r
-       $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
-\r
-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\htlbox.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTLBOX_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HTLBOX_OBJECTS =  \
+       $(OBJS)\htlbox_htlbox.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htlbox.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
+       -if exist $(OBJS)\htlbox.tds del $(OBJS)\htlbox.tds
+       -if exist $(OBJS)\htlbox.ilc del $(OBJS)\htlbox.ilc
+       -if exist $(OBJS)\htlbox.ild del $(OBJS)\htlbox.ild
+       -if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf
+       -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils
+
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS)  $(OBJS)\htlbox_htlbox.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_htlbox.res
+|
+
+$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp
+       $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp
+
+$(OBJS)\htlbox_htlbox.res: .\htlbox.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\htlbox.rc
+

diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 46859a5d0b923195baf3777823ffacbc0d24a4d5..06b0e3b5a2aba4d1f5065f16f2ea0dfaee30d77e 100644 (file)
--- a/samples/htlbox/makefile.gcc
+++ b/samples/htlbox/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HTLBOX_OBJECTS =  \\r
-       $(OBJS)\htlbox_htlbox.o \\r
-       $(OBJS)\htlbox_htlbox_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htlbox.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
-\r
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o\r
-       $(CXX) -o $@ $(HTLBOX_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\htlbox_htlbox.o: ./htlbox.cpp\r
-       $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\htlbox_htlbox_rc.o: ./htlbox.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HTLBOX_OBJECTS =  \
+       $(OBJS)\htlbox_htlbox.o \
+       $(OBJS)\htlbox_htlbox_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htlbox.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
+
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o
+       $(CXX) -o $@ $(HTLBOX_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\htlbox_htlbox.o: ./htlbox.cpp
+       $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\htlbox_htlbox_rc.o: ./htlbox.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx
index 47d6461f8c3b24523d1618e718081b48b4489781..0d18b9902cafe3b93a418ad830fbdef1ffcc77d1 100644 (file)
--- a/samples/htlbox/makefile.unx
+++ b/samples/htlbox/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index afd1bace58c59d88ecae10252048c294998dcad7..1c053b78ad433c05d598bcb68622e64ac67435f8 100644 (file)
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-HTLBOX_OBJECTS =  \\r
-       $(OBJS)\htlbox_htlbox.obj \\r
-       $(OBJS)\htlbox_htlbox.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htlbox.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
-       -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk\r
-       -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb\r
-\r
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HTLBOX_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
-\r
-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HTLBOX_OBJECTS =  \
+       $(OBJS)\htlbox_htlbox.obj
+HTLBOX_RESOURCES =  \
+       $(OBJS)\htlbox_htlbox.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htlbox.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
+       -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk
+       -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb
+
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HTLBOX_OBJECTS) $(HTLBOX_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp
+
+$(OBJS)\htlbox_htlbox.res: .\htlbox.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc
+

diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat
index 46274a90b88e5b4db943f333e107c4e6c10fd157..aa0eebbf9195bc5f9f4588d8be111f9a79f3ef26 100644 (file)
--- a/samples/htlbox/makefile.wat
+++ b/samples/htlbox/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-HTLBOX_OBJECTS =  &\r
-       $(OBJS)\htlbox_htlbox.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\htlbox.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
-\r
-$(OBJS)\htlbox.exe :  $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res\r
-       @%create $(OBJS)\htlbox.lbc\r
-       @%append $(OBJS)\htlbox.lbc option quiet\r
-       @%append $(OBJS)\htlbox.lbc name $^@\r
-       @%append $(OBJS)\htlbox.lbc option caseexact\r
-       @%append $(OBJS)\htlbox.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i\r
-       @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res\r
-       @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i\r
-       wlink @$(OBJS)\htlbox.lbc\r
-\r
-$(OBJS)\htlbox_htlbox.obj :  .AUTODEPEND .\htlbox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $<\r
-\r
-$(OBJS)\htlbox_htlbox.res :  .AUTODEPEND .\htlbox.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+HTLBOX_OBJECTS =  &
+       $(OBJS)\htlbox_htlbox.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\htlbox.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
+
+$(OBJS)\htlbox.exe :  $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
+       @%create $(OBJS)\htlbox.lbc
+       @%append $(OBJS)\htlbox.lbc option quiet
+       @%append $(OBJS)\htlbox.lbc name $^@
+       @%append $(OBJS)\htlbox.lbc option caseexact
+       @%append $(OBJS)\htlbox.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i
+       @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res
+       @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i
+       wlink @$(OBJS)\htlbox.lbc
+
+$(OBJS)\htlbox_htlbox.obj :  .AUTODEPEND .\htlbox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $<
+
+$(OBJS)\htlbox_htlbox.res :  .AUTODEPEND .\htlbox.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in
index 9690b32754094c2eda61f1c92715a1ddda54f335..f119ecf7ffd7b41f6b3ae3305d4e5c733438790a 100644 (file)
--- a/samples/html/Makefile.in
+++ b/samples/html/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 097fbe4471f37df44d2c3c7ade5f706a795ba737..9e15a70e144667b4980026a5d3ca52d0d85866e5 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp
index 2b1b62a0935ebaab67ce7f5b50b41bf75831b856..09fbfabd0909de30568c7adc11de67a556de43e4 100644 (file)
--- a/samples/html/about/about.dsp
+++ b/samples/html/about/about.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\about"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\about"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\about"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\about"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj
index 11df47f1f29c4b838d209c4888799f1df384eb8a..e74b6bf71b591543516d7980676536e425cc1a90 100644 (file)
--- a/samples/html/about/about_vc7.vcproj
+++ b/samples/html/about/about_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\about.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\about.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\about.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\about.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj
index e1b46feb178bd7de2b82dca194bf782871dad77c..c8a26d9d83a3cb4ded00fe8c4230b4282c992a0d 100644 (file)
--- a/samples/html/about/about_vc8.vcproj
+++ b/samples/html/about/about_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj
index 71de611d704a2bb0354a6f5c9ad9f8373c7646a9..f5f8050564cc0d87f202e2143b460fa1acdd7157 100644 (file)
--- a/samples/html/about/about_vc9.vcproj
+++ b/samples/html/about/about_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\about.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\about.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index 1eb110ff42651dcd7bf0d2c0cd6214ca462a535f..4d3869b9629bb4faec225c3bf2f3bda092ad4296 100644 (file)
--- a/samples/html/about/makefile.bcc
+++ b/samples/html/about/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ABOUT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ABOUT_OBJECTS =  \\r
-       $(OBJS)\about_about.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\about.exe data_files\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
-       -if exist $(OBJS)\about.tds del $(OBJS)\about.tds\r
-       -if exist $(OBJS)\about.ilc del $(OBJS)\about.ilc\r
-       -if exist $(OBJS)\about.ild del $(OBJS)\about.ild\r
-       -if exist $(OBJS)\about.ilf del $(OBJS)\about.ilf\r
-       -if exist $(OBJS)\about.ils del $(OBJS)\about.ils\r
-\r
-$(OBJS)\about.exe: $(ABOUT_OBJECTS)  $(OBJS)\about_about.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_about.res\r
-|\r
-\r
-data_files: \r
-       if not exist $(OBJS)\data mkdir $(OBJS)\data\r
-       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
-\r
-$(OBJS)\about_about.obj: .\about.cpp\r
-       $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
-\r
-$(OBJS)\about_about.res: .\about.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\about.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ABOUT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ABOUT_OBJECTS =  \
+       $(OBJS)\about_about.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\about.exe data_files
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe
+       -if exist $(OBJS)\about.tds del $(OBJS)\about.tds
+       -if exist $(OBJS)\about.ilc del $(OBJS)\about.ilc
+       -if exist $(OBJS)\about.ild del $(OBJS)\about.ild
+       -if exist $(OBJS)\about.ilf del $(OBJS)\about.ilf
+       -if exist $(OBJS)\about.ils del $(OBJS)\about.ils
+
+$(OBJS)\about.exe: $(ABOUT_OBJECTS)  $(OBJS)\about_about.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_about.res
+|
+
+data_files: 
+       if not exist $(OBJS)\data mkdir $(OBJS)\data
+       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+
+$(OBJS)\about_about.obj: .\about.cpp
+       $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp
+
+$(OBJS)\about_about.res: .\about.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\about.rc
+

diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index ed11864894036e409f723b39a7b491a71bd38d8d..f6f21e7fcb68cba01ff2098d9d4ba91506c1a4bc 100644 (file)
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ABOUT_OBJECTS =  \\r
-       $(OBJS)\about_about.o \\r
-       $(OBJS)\about_about_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\about.exe data_files\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
-\r
-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o\r
-       $(CXX) -o $@ $(ABOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data_files: \r
-       if not exist $(OBJS)\data mkdir $(OBJS)\data\r
-       for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data\r
-\r
-$(OBJS)\about_about.o: ./about.cpp\r
-       $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\about_about_rc.o: ./about.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data_files\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ABOUT_OBJECTS =  \
+       $(OBJS)\about_about.o \
+       $(OBJS)\about_about_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\about.exe data_files
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe
+
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o
+       $(CXX) -o $@ $(ABOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data_files: 
+       if not exist $(OBJS)\data mkdir $(OBJS)\data
+       for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data
+
+$(OBJS)\about_about.o: ./about.cpp
+       $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\about_about_rc.o: ./about.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data_files
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx
index 470b1b147522898ed48145521d943a3461ee3282..6a5da8bfa04a661ac17a9fe5f0ed6340dae90bcf 100644 (file)
--- a/samples/html/about/makefile.unx
+++ b/samples/html/about/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index c177d16fa1e0ee88ffcc46d71346906b3289c6e9..678cd8bbadc6ac3256bf485e077bc9b184347e82 100644 (file)
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-ABOUT_OBJECTS =  \\r
-       $(OBJS)\about_about.obj \\r
-       $(OBJS)\about_about.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\about.exe data_files\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
-       -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk\r
-       -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb\r
-\r
-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ABOUT_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data_files: \r
-       if not exist $(OBJS)\data mkdir $(OBJS)\data\r
-       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
-\r
-$(OBJS)\about_about.obj: .\about.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
-\r
-$(OBJS)\about_about.res: .\about.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ABOUT_OBJECTS =  \
+       $(OBJS)\about_about.obj
+ABOUT_RESOURCES =  \
+       $(OBJS)\about_about.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\about.exe data_files
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe
+       -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk
+       -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb
+
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ABOUT_OBJECTS) $(ABOUT_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data_files: 
+       if not exist $(OBJS)\data mkdir $(OBJS)\data
+       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+
+$(OBJS)\about_about.obj: .\about.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp
+
+$(OBJS)\about_about.res: .\about.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc
+

diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index 147234ec9c06f2d34a515e1d3644e38f52e8418d..453fc82a0fcd429f856272fb491f727f8d141fd0 100644 (file)
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-ABOUT_OBJECTS =  &\r
-       $(OBJS)\about_about.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\about.exe data_files\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
-\r
-$(OBJS)\about.exe :  $(ABOUT_OBJECTS) $(OBJS)\about_about.res\r
-       @%create $(OBJS)\about.lbc\r
-       @%append $(OBJS)\about.lbc option quiet\r
-       @%append $(OBJS)\about.lbc name $^@\r
-       @%append $(OBJS)\about.lbc option caseexact\r
-       @%append $(OBJS)\about.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\about.lbc library %i\r
-       @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res\r
-       @for %i in () do @%append $(OBJS)\about.lbc option stack=%i\r
-       wlink @$(OBJS)\about.lbc\r
-\r
-data_files : .SYMBOLIC \r
-       if not exist $(OBJS)\data mkdir $(OBJS)\data\r
-       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
-\r
-$(OBJS)\about_about.obj :  .AUTODEPEND .\about.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<\r
-\r
-$(OBJS)\about_about.res :  .AUTODEPEND .\about.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+ABOUT_OBJECTS =  &
+       $(OBJS)\about_about.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\about.exe data_files
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\about.exe del $(OBJS)\about.exe
+
+$(OBJS)\about.exe :  $(ABOUT_OBJECTS) $(OBJS)\about_about.res
+       @%create $(OBJS)\about.lbc
+       @%append $(OBJS)\about.lbc option quiet
+       @%append $(OBJS)\about.lbc name $^@
+       @%append $(OBJS)\about.lbc option caseexact
+       @%append $(OBJS)\about.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\about.lbc library %i
+       @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res
+       @for %i in () do @%append $(OBJS)\about.lbc option stack=%i
+       wlink @$(OBJS)\about.lbc
+
+data_files : .SYMBOLIC 
+       if not exist $(OBJS)\data mkdir $(OBJS)\data
+       for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+
+$(OBJS)\about_about.obj :  .AUTODEPEND .\about.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<
+
+$(OBJS)\about_about.res :  .AUTODEPEND .\about.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 50e9b04b3f0565a2a67468431252c607dc382720..5af57aa4562d5a32538520b826ec1f8d7de2f493 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index 61f26589f0657ee05bea71db42314c80c4d45d49..7831387bbc5b69700b051d5ed9fe4bf313bd366e 100644 (file)
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\htmlhelp"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\htmlhelp"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\htmlhelp"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\htmlhelp"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj
index 03726ae4c1461dc9980d1f9570bcbe01dbc5490a..3ee64dd21b57e1768d7cf9bff2fb5c0717712835 100644 (file)
--- a/samples/html/help/help_vc7.vcproj
+++ b/samples/html/help/help_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\htmlhelp.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj
index 40f2c53b6c85662182489ebf6ae1f5f2e87ecd19..03521304b3f592949114a616e5eeaaec6c9b0b04 100644 (file)
--- a/samples/html/help/help_vc8.vcproj
+++ b/samples/html/help/help_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj
index 805562fcb1875987238721ab8539b87b59fbaf43..4d307360db70ccc9aeb58c77829d1b3c54d3d6c2 100644 (file)
--- a/samples/html/help/help_vc9.vcproj
+++ b/samples/html/help/help_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlhelp.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index 80c82d400e95a9ba49ee33d56cd87d52be35f6d2..d6116c3064f40b85e24e184b867e099273f1a7a9 100644 (file)
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLHELP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLHELP_OBJECTS =  \\r
-       $(OBJS)\htmlhelp_help.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlhelp.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
-       -if exist $(OBJS)\htmlhelp.tds del $(OBJS)\htmlhelp.tds\r
-       -if exist $(OBJS)\htmlhelp.ilc del $(OBJS)\htmlhelp.ilc\r
-       -if exist $(OBJS)\htmlhelp.ild del $(OBJS)\htmlhelp.ild\r
-       -if exist $(OBJS)\htmlhelp.ilf del $(OBJS)\htmlhelp.ilf\r
-       -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils\r
-\r
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS)  $(OBJS)\htmlhelp_help.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_help.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
-       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles\r
-\r
-$(OBJS)\htmlhelp_help.obj: .\help.cpp\r
-       $(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
-\r
-$(OBJS)\htmlhelp_help.res: .\help.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\help.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLHELP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HTMLHELP_OBJECTS =  \
+       $(OBJS)\htmlhelp_help.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlhelp.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
+       -if exist $(OBJS)\htmlhelp.tds del $(OBJS)\htmlhelp.tds
+       -if exist $(OBJS)\htmlhelp.ilc del $(OBJS)\htmlhelp.ilc
+       -if exist $(OBJS)\htmlhelp.ild del $(OBJS)\htmlhelp.ild
+       -if exist $(OBJS)\htmlhelp.ilf del $(OBJS)\htmlhelp.ilf
+       -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils
+
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS)  $(OBJS)\htmlhelp_help.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_help.res
+|
+
+data: 
+       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
+       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+
+$(OBJS)\htmlhelp_help.obj: .\help.cpp
+       $(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp
+
+$(OBJS)\htmlhelp_help.res: .\help.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\help.rc
+

diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index ea266c810ff0eb7d63dd8aabb90c3a5e1f98b914..9699e653c64524b352a4801cd5f493e91fab80de 100644 (file)
--- a/samples/html/help/makefile.gcc
+++ b/samples/html/help/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLHELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLHELP_OBJECTS =  \\r
-       $(OBJS)\htmlhelp_help.o \\r
-       $(OBJS)\htmlhelp_help_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlhelp.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
-\r
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o\r
-       $(CXX) -o $@ $(HTMLHELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
-       for %%f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%%f copy .\helpfiles\%%f $(OBJS)\helpfiles\r
-\r
-$(OBJS)\htmlhelp_help.o: ./help.cpp\r
-       $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\htmlhelp_help_rc.o: ./help.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLHELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HTMLHELP_OBJECTS =  \
+       $(OBJS)\htmlhelp_help.o \
+       $(OBJS)\htmlhelp_help_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlhelp.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
+
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o
+       $(CXX) -o $@ $(HTMLHELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
+       for %%f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%%f copy .\helpfiles\%%f $(OBJS)\helpfiles
+
+$(OBJS)\htmlhelp_help.o: ./help.cpp
+       $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\htmlhelp_help_rc.o: ./help.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx
index ce066242a0a66862f3dc913de5aae9fd08ab98c0..4b920a551a0e2fba1be776c406341ddb35574497 100644 (file)
--- a/samples/html/help/makefile.unx
+++ b/samples/html/help/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index ab98908e6103b2e4ad7456bfc261be86444a8859..9f479f50ac74de24adc7f06b5f061258064da391 100644 (file)
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLHELP_OBJECTS =  \\r
-       $(OBJS)\htmlhelp_help.obj \\r
-       $(OBJS)\htmlhelp_help.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlhelp.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
-       -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk\r
-       -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb\r
-\r
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HTMLHELP_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
-       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles\r
-\r
-$(OBJS)\htmlhelp_help.obj: .\help.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
-\r
-$(OBJS)\htmlhelp_help.res: .\help.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HTMLHELP_OBJECTS =  \
+       $(OBJS)\htmlhelp_help.obj
+HTMLHELP_RESOURCES =  \
+       $(OBJS)\htmlhelp_help.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlhelp.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
+       -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk
+       -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb
+
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HTMLHELP_OBJECTS) $(HTMLHELP_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
+       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+
+$(OBJS)\htmlhelp_help.obj: .\help.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp
+
+$(OBJS)\htmlhelp_help.res: .\help.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc
+

diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index 844b44004e2aaa3f821c4ff3acd71e1f51b5ff33..fa593696e817434085b0009f4d05fb8a09bac337 100644 (file)
--- a/samples/html/help/makefile.wat
+++ b/samples/html/help/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLHELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLHELP_OBJECTS =  &\r
-       $(OBJS)\htmlhelp_help.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\htmlhelp.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
-\r
-$(OBJS)\htmlhelp.exe :  $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res\r
-       @%create $(OBJS)\htmlhelp.lbc\r
-       @%append $(OBJS)\htmlhelp.lbc option quiet\r
-       @%append $(OBJS)\htmlhelp.lbc name $^@\r
-       @%append $(OBJS)\htmlhelp.lbc option caseexact\r
-       @%append $(OBJS)\htmlhelp.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i\r
-       @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res\r
-       @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i\r
-       wlink @$(OBJS)\htmlhelp.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
-       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles\r
-\r
-$(OBJS)\htmlhelp_help.obj :  .AUTODEPEND .\help.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $<\r
-\r
-$(OBJS)\htmlhelp_help.res :  .AUTODEPEND .\help.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLHELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+HTMLHELP_OBJECTS =  &
+       $(OBJS)\htmlhelp_help.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\htmlhelp.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
+
+$(OBJS)\htmlhelp.exe :  $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
+       @%create $(OBJS)\htmlhelp.lbc
+       @%append $(OBJS)\htmlhelp.lbc option quiet
+       @%append $(OBJS)\htmlhelp.lbc name $^@
+       @%append $(OBJS)\htmlhelp.lbc option caseexact
+       @%append $(OBJS)\htmlhelp.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i
+       @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res
+       @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i
+       wlink @$(OBJS)\htmlhelp.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
+       for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+
+$(OBJS)\htmlhelp_help.obj :  .AUTODEPEND .\help.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $<
+
+$(OBJS)\htmlhelp_help.res :  .AUTODEPEND .\help.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 9e5c2005d5ce70e005ed2184d41df081818ab5a2..d13d825b3e6591124336c11f36c6788fd53a32ea 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp
index fdbe8804dc7642bf97f09227c89e6114894189a7..d394379e8d767fbbac4378ad7467d90d106d05da 100644 (file)
--- a/samples/html/helpview/helpview.dsp
+++ b/samples/html/helpview/helpview.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj
index 878f4cc9db115824479c6ddf527582e5a7ade059..f221499719a8ac6c4c5a681cdd674a274fc39ec5 100644 (file)
--- a/samples/html/helpview/helpview_vc7.vcproj
+++ b/samples/html/helpview/helpview_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj
index 7fef1ee4571e1a3303d91f24e87b82b2ad6d2d49..92ea1462f083a9f13387e402e17abe881b81229a 100644 (file)
--- a/samples/html/helpview/helpview_vc8.vcproj
+++ b/samples/html/helpview/helpview_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj
index 6df3a0f67a93fb7fd9fb7003d30472df71e77b70..de7a6a47a9d5c3124bcdf17fa8812cc1f5286e4c 100644 (file)
--- a/samples/html/helpview/helpview_vc9.vcproj
+++ b/samples/html/helpview/helpview_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index f274ed53b6414c7432398e6f7c96bf1c7528dc98..5f997010381f05cc7aee39fa834fde3df10a3986 100644 (file)
--- a/samples/html/helpview/makefile.bcc
+++ b/samples/html/helpview/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-       -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds\r
-       -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc\r
-       -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild\r
-       -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf\r
-       -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
-       $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
-\r
-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+       -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds
+       -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc
+       -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild
+       -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf
+       -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+       $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc
+

diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 6a79c6f1bf6089a904993c11868f6e99ecc48e15..82fd80a71c0090b17be9ee326a518769f940f9a8 100644 (file)
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.o \\r
-       $(OBJS)\helpview_helpview_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o\r
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.o: ./helpview.cpp\r
-       $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.o \
+       $(OBJS)\helpview_helpview_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\helpview_helpview.o: ./helpview.cpp
+       $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\helpview_helpview_rc.o: ./helpview.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx
index c4317063c367ead06d541200fc0165c83a1f61da..e18f8dbc5a09bf1541433704d0897511300463a3 100644 (file)
--- a/samples/html/helpview/makefile.unx
+++ b/samples/html/helpview/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index f1f37bb18b709e10428988c0848d29b87a4b792a..bc89f2fdd3e5e7fd949a58adb06e99b27ad849a0 100644 (file)
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.obj \\r
-       $(OBJS)\helpview_helpview.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-       -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk\r
-       -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HELPVIEW_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
-\r
-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.obj
+HELPVIEW_RESOURCES =  \
+       $(OBJS)\helpview_helpview.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+       -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk
+       -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc
+

diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index 1ae05e364059381b68d2dcb2809f5c55cb150b91..c0f728bbc76ee533fef40d7d3d6bb753fefc05e3 100644 (file)
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  &\r
-       $(OBJS)\helpview_helpview.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\helpview.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-\r
-$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
-       @%create $(OBJS)\helpview.lbc\r
-       @%append $(OBJS)\helpview.lbc option quiet\r
-       @%append $(OBJS)\helpview.lbc name $^@\r
-       @%append $(OBJS)\helpview.lbc option caseexact\r
-       @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i\r
-       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res\r
-       @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i\r
-       wlink @$(OBJS)\helpview.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  &
+       $(OBJS)\helpview_helpview.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\helpview.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+
+$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+       @%create $(OBJS)\helpview.lbc
+       @%append $(OBJS)\helpview.lbc option quiet
+       @%append $(OBJS)\helpview.lbc name $^@
+       @%append $(OBJS)\helpview.lbc option caseexact
+       @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i
+       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
+       @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i
+       wlink @$(OBJS)\helpview.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<
+
+$(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index c676f9d0426c9cdeed9795c325f48ca3b760f028..6cf7d6d65ee7622d458a00cbb6bc613e8d50ec9e 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx
index bc906fcc2e7c58d658e23d1ea47c69df5a60572c..2544522717317f3b98c525eb85d7550acb62636a 100644 (file)
--- a/samples/html/htmlctrl/makefile.unx
+++ b/samples/html/htmlctrl/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc
index ca9b0a52bfd23edb6423bfac431b9a9047d588c5..9ca6bb57162f81faee14183d8e4d713aa62b361d 100644 (file)
--- a/samples/html/makefile.bcc
+++ b/samples/html/makefile.bcc
@@ -1,133 +1,133 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \\r
-       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \\r
-       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \\r
-       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \\r
-       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \\r
-       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \\r
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \\r
-       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \\r
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
-       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
-       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
-       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: about help helpview printing test virtual widget zip\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.csm del .\*.csm\r
-       @echo cd about >about.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>about.bat\r
-       call about.bat\r
-       @del about.bat\r
-       @echo cd help >help.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat\r
-       call help.bat\r
-       @del help.bat\r
-       @echo cd helpview >helpview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat\r
-       call helpview.bat\r
-       @del helpview.bat\r
-       @echo cd printing >printing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat\r
-       call printing.bat\r
-       @del printing.bat\r
-       @echo cd test >test.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>test.bat\r
-       call test.bat\r
-       @del test.bat\r
-       @echo cd virtual >virtual.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>virtual.bat\r
-       call virtual.bat\r
-       @del virtual.bat\r
-       @echo cd widget >widget.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widget.bat\r
-       call widget.bat\r
-       @del widget.bat\r
-       @echo cd zip >zip.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>zip.bat\r
-       call zip.bat\r
-       @del zip.bat\r
-\r
-about: \r
-       @echo cd about >about.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>about.bat\r
-       call about.bat\r
-       @del about.bat\r
-\r
-help: \r
-       @echo cd help >help.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat\r
-       call help.bat\r
-       @del help.bat\r
-\r
-helpview: \r
-       @echo cd helpview >helpview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat\r
-       call helpview.bat\r
-       @del helpview.bat\r
-\r
-printing: \r
-       @echo cd printing >printing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat\r
-       call printing.bat\r
-       @del printing.bat\r
-\r
-test: \r
-       @echo cd test >test.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>test.bat\r
-       call test.bat\r
-       @del test.bat\r
-\r
-virtual: \r
-       @echo cd virtual >virtual.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>virtual.bat\r
-       call virtual.bat\r
-       @del virtual.bat\r
-\r
-widget: \r
-       @echo cd widget >widget.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widget.bat\r
-       call widget.bat\r
-       @del widget.bat\r
-\r
-zip: \r
-       @echo cd zip >zip.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>zip.bat\r
-       call zip.bat\r
-       @del zip.bat\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
+       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: about help helpview printing test virtual widget zip
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd about >about.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>about.bat
+       call about.bat
+       @del about.bat
+       @echo cd help >help.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat
+       call help.bat
+       @del help.bat
+       @echo cd helpview >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+       @echo cd printing >printing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
+       call printing.bat
+       @del printing.bat
+       @echo cd test >test.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>test.bat
+       call test.bat
+       @del test.bat
+       @echo cd virtual >virtual.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>virtual.bat
+       call virtual.bat
+       @del virtual.bat
+       @echo cd widget >widget.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widget.bat
+       call widget.bat
+       @del widget.bat
+       @echo cd zip >zip.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>zip.bat
+       call zip.bat
+       @del zip.bat
+
+about: 
+       @echo cd about >about.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>about.bat
+       call about.bat
+       @del about.bat
+
+help: 
+       @echo cd help >help.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat
+       call help.bat
+       @del help.bat
+
+helpview: 
+       @echo cd helpview >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+
+printing: 
+       @echo cd printing >printing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat
+       call printing.bat
+       @del printing.bat
+
+test: 
+       @echo cd test >test.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>test.bat
+       call test.bat
+       @del test.bat
+
+virtual: 
+       @echo cd virtual >virtual.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>virtual.bat
+       call virtual.bat
+       @del virtual.bat
+
+widget: 
+       @echo cd widget >widget.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widget.bat
+       call widget.bat
+       @del widget.bat
+
+zip: 
+       @echo cd zip >zip.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>zip.bat
+       call zip.bat
+       @del zip.bat
+

diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc
index 0db311a47f46b8ed6a08051bc770baf0275f5999..5113d957f8dcd091cc0ff13949df2f8dc3c0fab0 100644 (file)
--- a/samples/html/makefile.gcc
+++ b/samples/html/makefile.gcc
@@ -1,83 +1,83 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: about help helpview printing test virtual widget zip\r
-\r
-clean: \r
-       -if exist .\*.o del .\*.o\r
-       -if exist .\*.d del .\*.d\r
-       $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) clean\r
-\r
-about: \r
-       $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all\r
-\r
-help: \r
-       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all\r
-\r
-helpview: \r
-       $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) all\r
-\r
-printing: \r
-       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all\r
-\r
-test: \r
-       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) all\r
-\r
-virtual: \r
-       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) all\r
-\r
-widget: \r
-       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) all\r
-\r
-zip: \r
-       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all\r
-\r
-.PHONY: all clean about help helpview printing test virtual widget zip\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include ./*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: about help helpview printing test virtual widget zip
+
+clean: 
+       -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) clean
+
+about: 
+       $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all
+
+help: 
+       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
+
+helpview: 
+       $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) all
+
+printing: 
+       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
+
+test: 
+       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) all
+
+virtual: 
+       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) all
+
+widget: 
+       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) all
+
+zip: 
+       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean about help helpview printing test virtual widget zip
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d

diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx
index b2e181349d11c697ebe433a8981c4fdb31c1dec8..77dc453e1cd6978045bee9824dee9612b5167611 100644 (file)
--- a/samples/html/makefile.unx
+++ b/samples/html/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc
index 57c911403aa5eddeff6820782db2e85251ff0f00..5bb56d403599dadf77fb30d6c2b067ee69300d1b 100644 (file)
--- a/samples/html/makefile.vc
+++ b/samples/html/makefile.vc
@@ -1,108 +1,108 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
-       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.pch del .\*.pch\r
-       cd about\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd help\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd helpview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd printing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd test\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd virtual\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd widget\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd zip\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_about: \r
-       cd about\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_help: \r
-       cd help\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_helpview: \r
-       cd helpview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_printing: \r
-       cd printing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_test: \r
-       cd test\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_virtual: \r
-       cd virtual\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_widget: \r
-       cd widget\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_zip: \r
-       cd zip\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd about
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd help
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd helpview
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd printing
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd test
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd virtual
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd widget
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd zip
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+
+sub_about: 
+       cd about
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_help: 
+       cd help
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_helpview: 
+       cd helpview
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_printing: 
+       cd printing
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_test: 
+       cd test
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_virtual: 
+       cd virtual
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_widget: 
+       cd widget
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_zip: 
+       cd zip
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+

diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat
index b03440bdc4ea1b9f9ee68d906fbf57b49292fafa..daefa79286805becf4da3e8a07783208b9c93d9e 100644 (file)
--- a/samples/html/makefile.wat
+++ b/samples/html/makefile.wat
@@ -1,128 +1,128 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC about help helpview printing test virtual widget zip\r
-\r
-clean : .SYMBOLIC \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.lbc del .\*.lbc\r
-       -if exist .\*.ilk del .\*.ilk\r
-       -if exist .\*.pch del .\*.pch\r
-       cd about\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd help\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd helpview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd printing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd test\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd virtual\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd widget\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd zip\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-\r
-about : .SYMBOLIC \r
-       cd about\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-help : .SYMBOLIC \r
-       cd help\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-helpview : .SYMBOLIC \r
-       cd helpview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-printing : .SYMBOLIC \r
-       cd printing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-test : .SYMBOLIC \r
-       cd test\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-virtual : .SYMBOLIC \r
-       cd virtual\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-widget : .SYMBOLIC \r
-       cd widget\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-zip : .SYMBOLIC \r
-       cd zip\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+
+### Targets: ###
+
+all : .SYMBOLIC about help helpview printing test virtual widget zip
+
+clean : .SYMBOLIC 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd about
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd help
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd helpview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd printing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd test
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd virtual
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd widget
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd zip
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+about : .SYMBOLIC 
+       cd about
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+help : .SYMBOLIC 
+       cd help
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+helpview : .SYMBOLIC 
+       cd helpview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+printing : .SYMBOLIC 
+       cd printing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+test : .SYMBOLIC 
+       cd test
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+virtual : .SYMBOLIC 
+       cd virtual
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+widget : .SYMBOLIC 
+       cd widget
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+zip : .SYMBOLIC 
+       cd zip
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index c72947589df0e47c808aefd49496158cf413c438..ca3851a7dc01a0a84b5a9af1a5685177e6a8e31a 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc
index 867c5cc5a68f50c6a993bd927143678c2b90f88a..c7a6e11a2c1644ac0d7fd1551cede4ba9f5bf289 100644 (file)
--- a/samples/html/printing/makefile.bcc
+++ b/samples/html/printing/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLPRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLPRINTING_OBJECTS =  \\r
-       $(OBJS)\htmlprinting_printing.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlprinting.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
-       -if exist $(OBJS)\htmlprinting.tds del $(OBJS)\htmlprinting.tds\r
-       -if exist $(OBJS)\htmlprinting.ilc del $(OBJS)\htmlprinting.ilc\r
-       -if exist $(OBJS)\htmlprinting.ild del $(OBJS)\htmlprinting.ild\r
-       -if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf\r
-       -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils\r
-\r
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS)  $(OBJS)\htmlprinting_printing.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\htmlprinting_printing.obj: .\printing.cpp\r
-       $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
-\r
-$(OBJS)\htmlprinting_printing.res: .\printing.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\printing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLPRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HTMLPRINTING_OBJECTS =  \
+       $(OBJS)\htmlprinting_printing.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlprinting.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
+       -if exist $(OBJS)\htmlprinting.tds del $(OBJS)\htmlprinting.tds
+       -if exist $(OBJS)\htmlprinting.ilc del $(OBJS)\htmlprinting.ilc
+       -if exist $(OBJS)\htmlprinting.ild del $(OBJS)\htmlprinting.ild
+       -if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf
+       -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils
+
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS)  $(OBJS)\htmlprinting_printing.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\htmlprinting_printing.obj: .\printing.cpp
+       $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp
+
+$(OBJS)\htmlprinting_printing.res: .\printing.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\printing.rc
+

diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 17ad9930ae294d6fef5b5b8adcd91230e1fb059d..94df8f9d540a6162fca08ffb92f7830571d1f7aa 100644 (file)
--- a/samples/html/printing/makefile.gcc
+++ b/samples/html/printing/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLPRINTING_OBJECTS =  \\r
-       $(OBJS)\htmlprinting_printing.o \\r
-       $(OBJS)\htmlprinting_printing_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlprinting.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
-\r
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o\r
-       $(CXX) -o $@ $(HTMLPRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\htmlprinting_printing.o: ./printing.cpp\r
-       $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HTMLPRINTING_OBJECTS =  \
+       $(OBJS)\htmlprinting_printing.o \
+       $(OBJS)\htmlprinting_printing_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlprinting.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
+
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o
+       $(CXX) -o $@ $(HTMLPRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\htmlprinting_printing.o: ./printing.cpp
+       $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx
index ebfeac95977d6b0b0c8e618829275196b3a542f1..5d7df30a9886489c1a048423907167cb8b799aef 100644 (file)
--- a/samples/html/printing/makefile.unx
+++ b/samples/html/printing/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index 6b2d0e94adad983f36a97f2194a79033e1c14e85..6be603836f627310defe2b317f7923a56bdaace2 100644 (file)
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLPRINTING_OBJECTS =  \\r
-       $(OBJS)\htmlprinting_printing.obj \\r
-       $(OBJS)\htmlprinting_printing.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\htmlprinting.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
-       -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk\r
-       -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb\r
-\r
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HTMLPRINTING_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\htmlprinting_printing.obj: .\printing.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
-\r
-$(OBJS)\htmlprinting_printing.res: .\printing.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\printing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HTMLPRINTING_OBJECTS =  \
+       $(OBJS)\htmlprinting_printing.obj
+HTMLPRINTING_RESOURCES =  \
+       $(OBJS)\htmlprinting_printing.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\htmlprinting.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
+       -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk
+       -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb
+
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HTMLPRINTING_OBJECTS) $(HTMLPRINTING_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\htmlprinting_printing.obj: .\printing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp
+
+$(OBJS)\htmlprinting_printing.res: .\printing.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\printing.rc
+

diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index c44b7eb97e4bbcfb22d997754b54731433eb06da..a80b391fe605217c14eb72007d896f601208e454 100644 (file)
--- a/samples/html/printing/makefile.wat
+++ b/samples/html/printing/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) &\r
-       $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &\r
-       -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-HTMLPRINTING_OBJECTS =  &\r
-       $(OBJS)\htmlprinting_printing.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\htmlprinting.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
-\r
-$(OBJS)\htmlprinting.exe :  $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res\r
-       @%create $(OBJS)\htmlprinting.lbc\r
-       @%append $(OBJS)\htmlprinting.lbc option quiet\r
-       @%append $(OBJS)\htmlprinting.lbc name $^@\r
-       @%append $(OBJS)\htmlprinting.lbc option caseexact\r
-       @%append $(OBJS)\htmlprinting.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlprinting.lbc library %i\r
-       @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res\r
-       @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i\r
-       wlink @$(OBJS)\htmlprinting.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\htmlprinting_printing.obj :  .AUTODEPEND .\printing.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $<\r
-\r
-$(OBJS)\htmlprinting_printing.res :  .AUTODEPEND .\printing.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) &
+       $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
+       -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+HTMLPRINTING_OBJECTS =  &
+       $(OBJS)\htmlprinting_printing.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\htmlprinting.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
+
+$(OBJS)\htmlprinting.exe :  $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
+       @%create $(OBJS)\htmlprinting.lbc
+       @%append $(OBJS)\htmlprinting.lbc option quiet
+       @%append $(OBJS)\htmlprinting.lbc name $^@
+       @%append $(OBJS)\htmlprinting.lbc option caseexact
+       @%append $(OBJS)\htmlprinting.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlprinting.lbc library %i
+       @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res
+       @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i
+       wlink @$(OBJS)\htmlprinting.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\htmlprinting_printing.obj :  .AUTODEPEND .\printing.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $<
+
+$(OBJS)\htmlprinting_printing.res :  .AUTODEPEND .\printing.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp
index 506858b0a9ddd4812757c6bcd6628ad1d5489eb4..42823895860033eb92d4efd9f0894070704d5c4d 100644 (file)
--- a/samples/html/printing/printing.dsp
+++ b/samples/html/printing/printing.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\htmlprinting"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\htmlprinting"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\htmlprinting"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\htmlprinting"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj
index 90f2f7bcf60dd216dd49eea11a37d192a06e9aac..07e0ab9be76616912d2a26111f64783d83b32e75 100644 (file)
--- a/samples/html/printing/printing_vc7.vcproj
+++ b/samples/html/printing/printing_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\htmlprinting.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj
index 69f8c2450aed138f4424ad82a086f3db34227c5c..9bb1a3c77341b36381099489b3cf8b8d5805a2d8 100644 (file)
--- a/samples/html/printing/printing_vc8.vcproj
+++ b/samples/html/printing/printing_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj
index d7357085489fad4843f2acd7f2e94fced242c31b..99a49bc67d59028acfe96d28477fe0ec0b1988f0 100644 (file)
--- a/samples/html/printing/printing_vc9.vcproj
+++ b/samples/html/printing/printing_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\htmlprinting.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 02ed55f24c1ea87a368c58f626624113b2e26efc..d8a3d3cfc33b231cef188cb3e0a17abfd700eb41 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc
index 4f064d9889ed75d9b1721848c6978fbe72ed1a22..346013ef6d26c36ece530a22d1a56b10e5a5a9e7 100644 (file)
--- a/samples/html/test/makefile.bcc
+++ b/samples/html/test/makefile.bcc
@@ -1,244 +1,244 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TEST_OBJECTS =  \\r
-       $(OBJS)\test_test.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\test.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
-       -if exist $(OBJS)\test.tds del $(OBJS)\test.tds\r
-       -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc\r
-       -if exist $(OBJS)\test.ild del $(OBJS)\test.ild\r
-       -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf\r
-       -if exist $(OBJS)\test.ils del $(OBJS)\test.ils\r
-\r
-$(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_test.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_test.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\test_test.obj: .\test.cpp\r
-       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp\r
-\r
-$(OBJS)\test_test.res: .\test.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\test.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS =  \
+       $(OBJS)\test_test.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+       -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
+       -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
+       -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
+       -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
+       -if exist $(OBJS)\test.ils del $(OBJS)\test.ils
+
+$(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_test.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_test.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\test_test.obj: .\test.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_test.res: .\test.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\test.rc
+

diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index 51d320474d26503ac85e04d28bdae841ad1c0d5b..f5b023d381ea4597312795a966712a09d8c96fdd 100644 (file)
--- a/samples/html/test/makefile.gcc
+++ b/samples/html/test/makefile.gcc
@@ -1,238 +1,238 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TEST_OBJECTS =  \\r
-       $(OBJS)\test_test.o \\r
-       $(OBJS)\test_test_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\test.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
-\r
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o\r
-       $(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\test_test.o: ./test.cpp\r
-       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\test_test_rc.o: ./test.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS =  \
+       $(OBJS)\test_test.o \
+       $(OBJS)\test_test_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+
+$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
+       $(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\test_test.o: ./test.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_test_rc.o: ./test.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx
index 2b0ee4f81d2ae868fb01b50e54d6d99ef7a0eda8..8b2dab361e16748a0f87d36e9c716a190d72a290 100644 (file)
--- a/samples/html/test/makefile.unx
+++ b/samples/html/test/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 81e4872c05bcdb439eb48eee243d4bef30962b4c..108002a2250efd9f71965126b7812c608ba537da 100644 (file)
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -1,323 +1,348 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-TEST_OBJECTS =  \\r
-       $(OBJS)\test_test.obj \\r
-       $(OBJS)\test_test.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\test.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
-       -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk\r
-       -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb\r
-\r
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TEST_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\test_test.obj: .\test.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp\r
-\r
-$(OBJS)\test_test.res: .\test.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS =  \
+       $(OBJS)\test_test.obj
+TEST_RESOURCES =  \
+       $(OBJS)\test_test.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\test.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+       -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
+       -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
+
+$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TEST_OBJECTS) $(TEST_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\test_test.obj: .\test.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_test.res: .\test.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc
+

diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index a70aae0f31817b2f4e89a5a863d9edaf5517c9d8..a75fdc7a7d53ca4d7f2ad26a9d16eb598f93bc53 100644 (file)
--- a/samples/html/test/makefile.wat
+++ b/samples/html/test/makefile.wat
@@ -1,274 +1,274 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-TEST_OBJECTS =  &\r
-       $(OBJS)\test_test.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\test.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
-\r
-$(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_test.res\r
-       @%create $(OBJS)\test.lbc\r
-       @%append $(OBJS)\test.lbc option quiet\r
-       @%append $(OBJS)\test.lbc name $^@\r
-       @%append $(OBJS)\test.lbc option caseexact\r
-       @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test.lbc library %i\r
-       @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res\r
-       @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
-       wlink @$(OBJS)\test.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\test_test.res :  .AUTODEPEND .\test.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS =  &
+       $(OBJS)\test_test.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\test.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+
+$(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_test.res
+       @%create $(OBJS)\test.lbc
+       @%append $(OBJS)\test.lbc option quiet
+       @%append $(OBJS)\test.lbc name $^@
+       @%append $(OBJS)\test.lbc option caseexact
+       @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test.lbc library %i
+       @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res
+       @for %i in () do @%append $(OBJS)\test.lbc option stack=%i
+       wlink @$(OBJS)\test.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_test.res :  .AUTODEPEND .\test.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp
index f0785e04733b66a86b909c3e0493ec3b24762b28..756581db68f06eb27f729db494242bc1b24e2dc1 100644 (file)
--- a/samples/html/test/test.dsp
+++ b/samples/html/test/test.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj
index 6f1d2117ce1051889bac0053d5b56cc44c40b638..c9dbd17899512e8293d2bcfe133408cd7561aa23 100644 (file)
--- a/samples/html/test/test_vc7.vcproj
+++ b/samples/html/test/test_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj
index 3b51324d3f162f3fbf0d77221f186c0008dfcdaf..9672d1745b2e0a75b434faa1c3d3ddcd9d559e84 100644 (file)
--- a/samples/html/test/test_vc8.vcproj
+++ b/samples/html/test/test_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj
index b23b62fd2c1808c2be4dbb148e5a55c562c15740..e7eb7f248dbd7a99b9a3a4369dbbb7980085e55e 100644 (file)
--- a/samples/html/test/test_vc9.vcproj
+++ b/samples/html/test/test_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index c2cb7d25e913b4ff146f313915a173e8f28f6a78..b8a112ee9f4b4cfcfde7b112c67a7150d2da20f0 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc
index 1043133bd026545a0c59a15498d21ca8e5c59a3b..e41eb8888f7aabfacd8a5482ebbe470d3d246da0 100644 (file)
--- a/samples/html/virtual/makefile.bcc
+++ b/samples/html/virtual/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VIRTUAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-VIRTUAL_OBJECTS =  \\r
-       $(OBJS)\virtual_virtual.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\virtual.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
-       -if exist $(OBJS)\virtual.tds del $(OBJS)\virtual.tds\r
-       -if exist $(OBJS)\virtual.ilc del $(OBJS)\virtual.ilc\r
-       -if exist $(OBJS)\virtual.ild del $(OBJS)\virtual.ild\r
-       -if exist $(OBJS)\virtual.ilf del $(OBJS)\virtual.ilf\r
-       -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils\r
-\r
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS)  $(OBJS)\virtual_virtual.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_virtual.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\virtual_virtual.obj: .\virtual.cpp\r
-       $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
-\r
-$(OBJS)\virtual_virtual.res: .\virtual.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\virtual.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VIRTUAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+VIRTUAL_OBJECTS =  \
+       $(OBJS)\virtual_virtual.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\virtual.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
+       -if exist $(OBJS)\virtual.tds del $(OBJS)\virtual.tds
+       -if exist $(OBJS)\virtual.ilc del $(OBJS)\virtual.ilc
+       -if exist $(OBJS)\virtual.ild del $(OBJS)\virtual.ild
+       -if exist $(OBJS)\virtual.ilf del $(OBJS)\virtual.ilf
+       -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils
+
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS)  $(OBJS)\virtual_virtual.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_virtual.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\virtual_virtual.obj: .\virtual.cpp
+       $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp
+
+$(OBJS)\virtual_virtual.res: .\virtual.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\virtual.rc
+

diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index d5f6f6c5bb223c0d962038bb28b78cacb11aa6a4..404fa6152bfac683befa7cb1014542060bc89bba 100644 (file)
--- a/samples/html/virtual/makefile.gcc
+++ b/samples/html/virtual/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VIRTUAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-VIRTUAL_OBJECTS =  \\r
-       $(OBJS)\virtual_virtual.o \\r
-       $(OBJS)\virtual_virtual_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\virtual.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
-\r
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o\r
-       $(CXX) -o $@ $(VIRTUAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\virtual_virtual.o: ./virtual.cpp\r
-       $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\virtual_virtual_rc.o: ./virtual.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VIRTUAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+VIRTUAL_OBJECTS =  \
+       $(OBJS)\virtual_virtual.o \
+       $(OBJS)\virtual_virtual_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\virtual.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
+
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o
+       $(CXX) -o $@ $(VIRTUAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\virtual_virtual.o: ./virtual.cpp
+       $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\virtual_virtual_rc.o: ./virtual.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx
index 1b64b310f15eba58d9a005e0a1fb2b3376a22cb0..94b0e977179742ffee10d24efa6353b9e48a5094 100644 (file)
--- a/samples/html/virtual/makefile.unx
+++ b/samples/html/virtual/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index 1f58ef4b43f5257f82147feb58004362315b74d0..b0f4a7e4cef1019f5a3ff7a5c460b8c8fd458f1f 100644 (file)
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-VIRTUAL_OBJECTS =  \\r
-       $(OBJS)\virtual_virtual.obj \\r
-       $(OBJS)\virtual_virtual.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\virtual.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
-       -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk\r
-       -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb\r
-\r
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(VIRTUAL_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\virtual_virtual.obj: .\virtual.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
-\r
-$(OBJS)\virtual_virtual.res: .\virtual.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+VIRTUAL_OBJECTS =  \
+       $(OBJS)\virtual_virtual.obj
+VIRTUAL_RESOURCES =  \
+       $(OBJS)\virtual_virtual.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\virtual.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
+       -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk
+       -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb
+
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(VIRTUAL_OBJECTS) $(VIRTUAL_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\virtual_virtual.obj: .\virtual.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp
+
+$(OBJS)\virtual_virtual.res: .\virtual.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc
+

diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index d9e726fb366555852f844cfcbe08b356f80ec3a6..9ec39e68046a56a5e630cb8a5ba584dae2443093 100644 (file)
--- a/samples/html/virtual/makefile.wat
+++ b/samples/html/virtual/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-VIRTUAL_OBJECTS =  &\r
-       $(OBJS)\virtual_virtual.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\virtual.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
-\r
-$(OBJS)\virtual.exe :  $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res\r
-       @%create $(OBJS)\virtual.lbc\r
-       @%append $(OBJS)\virtual.lbc option quiet\r
-       @%append $(OBJS)\virtual.lbc name $^@\r
-       @%append $(OBJS)\virtual.lbc option caseexact\r
-       @%append $(OBJS)\virtual.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\virtual.lbc library %i\r
-       @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res\r
-       @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i\r
-       wlink @$(OBJS)\virtual.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\virtual_virtual.obj :  .AUTODEPEND .\virtual.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $<\r
-\r
-$(OBJS)\virtual_virtual.res :  .AUTODEPEND .\virtual.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+VIRTUAL_OBJECTS =  &
+       $(OBJS)\virtual_virtual.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\virtual.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
+
+$(OBJS)\virtual.exe :  $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
+       @%create $(OBJS)\virtual.lbc
+       @%append $(OBJS)\virtual.lbc option quiet
+       @%append $(OBJS)\virtual.lbc name $^@
+       @%append $(OBJS)\virtual.lbc option caseexact
+       @%append $(OBJS)\virtual.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\virtual.lbc library %i
+       @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res
+       @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i
+       wlink @$(OBJS)\virtual.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\virtual_virtual.obj :  .AUTODEPEND .\virtual.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $<
+
+$(OBJS)\virtual_virtual.res :  .AUTODEPEND .\virtual.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp
index 038f7345ee258bb2c57f493080372ae3147484b7..4b856cf5fb32a43663e192e81806d769800c5765 100644 (file)
--- a/samples/html/virtual/virtual.dsp
+++ b/samples/html/virtual/virtual.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\virtual"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\virtual"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\virtual"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\virtual"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj
index af36e2d12e36b56d48ccdea7d5bcf2982511044e..be90b5e1dcea681af2c9ef611c860f8c7351a96a 100644 (file)
--- a/samples/html/virtual/virtual_vc7.vcproj
+++ b/samples/html/virtual/virtual_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\virtual.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\virtual.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\virtual.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\virtual.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj
index 70100ab8a74d9d0f07b2c47da054fe4145ba7230..8d4257268b57b3a6c51d613c6492e1215844e170 100644 (file)
--- a/samples/html/virtual/virtual_vc8.vcproj
+++ b/samples/html/virtual/virtual_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj
index 50b806d5f74f283859db15a2d10cb2847e6142bd..c24907a31c7e0cc6df52fffbec13d413c5773007 100644 (file)
--- a/samples/html/virtual/virtual_vc9.vcproj
+++ b/samples/html/virtual/virtual_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\virtual.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\virtual.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 4d3369e838dddd231868520e7abc58e587466702..5dd62e5807102c2919639527bdff7a8ae332f258 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc
index 0808e12e6b55bab9e52ad83d8f11811852299ace..c91956f3f7ece962267f292a391b7527a8202b51 100644 (file)
--- a/samples/html/widget/makefile.bcc
+++ b/samples/html/widget/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGET_OBJECTS =  \\r
-       $(OBJS)\widget_widget.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widget.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
-       -if exist $(OBJS)\widget.tds del $(OBJS)\widget.tds\r
-       -if exist $(OBJS)\widget.ilc del $(OBJS)\widget.ilc\r
-       -if exist $(OBJS)\widget.ild del $(OBJS)\widget.ild\r
-       -if exist $(OBJS)\widget.ilf del $(OBJS)\widget.ilf\r
-       -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils\r
-\r
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS)  $(OBJS)\widget_widget.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_widget.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\widget_widget.obj: .\widget.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
-\r
-$(OBJS)\widget_widget.res: .\widget.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\widget.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGET_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WIDGET_OBJECTS =  \
+       $(OBJS)\widget_widget.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widget.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
+       -if exist $(OBJS)\widget.tds del $(OBJS)\widget.tds
+       -if exist $(OBJS)\widget.ilc del $(OBJS)\widget.ilc
+       -if exist $(OBJS)\widget.ild del $(OBJS)\widget.ild
+       -if exist $(OBJS)\widget.ilf del $(OBJS)\widget.ilf
+       -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils
+
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS)  $(OBJS)\widget_widget.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_widget.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\widget_widget.obj: .\widget.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp
+
+$(OBJS)\widget_widget.res: .\widget.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\widget.rc
+

diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index 954d4af61c92e75622020399936ab02e5d7b3d2b..f422f5d7f3141371bc65a21493f55f1894c55855 100644 (file)
--- a/samples/html/widget/makefile.gcc
+++ b/samples/html/widget/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGET_OBJECTS =  \\r
-       $(OBJS)\widget_widget.o \\r
-       $(OBJS)\widget_widget_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widget.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
-\r
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o\r
-       $(CXX) -o $@ $(WIDGET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\widget_widget.o: ./widget.cpp\r
-       $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widget_widget_rc.o: ./widget.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WIDGET_OBJECTS =  \
+       $(OBJS)\widget_widget.o \
+       $(OBJS)\widget_widget_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widget.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
+
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o
+       $(CXX) -o $@ $(WIDGET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\widget_widget.o: ./widget.cpp
+       $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widget_widget_rc.o: ./widget.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx
index 0dc54686d2b5f21dec65c2df5e04874b01561af5..3f38aac980ed67f81b67170876776a93b920bf78 100644 (file)
--- a/samples/html/widget/makefile.unx
+++ b/samples/html/widget/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index a8a8f50aa638650a2b47c7b363e2ca3f424d5db5..199d5d25e24b98a2ec1bba0a2477e658d8b72656 100644 (file)
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGET_OBJECTS =  \\r
-       $(OBJS)\widget_widget.obj \\r
-       $(OBJS)\widget_widget.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widget.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
-       -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk\r
-       -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb\r
-\r
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WIDGET_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\widget_widget.obj: .\widget.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
-\r
-$(OBJS)\widget_widget.res: .\widget.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WIDGET_OBJECTS =  \
+       $(OBJS)\widget_widget.obj
+WIDGET_RESOURCES =  \
+       $(OBJS)\widget_widget.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widget.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
+       -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk
+       -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb
+
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WIDGET_OBJECTS) $(WIDGET_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\widget_widget.obj: .\widget.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp
+
+$(OBJS)\widget_widget.res: .\widget.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc
+

diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 7a52d2c56f8b1e1abfd7c06a28a4ba337feda65d..c9cef980f18f0a1cc2fe5f0212c9cd5e0d89b994 100644 (file)
--- a/samples/html/widget/makefile.wat
+++ b/samples/html/widget/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGET_OBJECTS =  &\r
-       $(OBJS)\widget_widget.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\widget.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
-\r
-$(OBJS)\widget.exe :  $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res\r
-       @%create $(OBJS)\widget.lbc\r
-       @%append $(OBJS)\widget.lbc option quiet\r
-       @%append $(OBJS)\widget.lbc name $^@\r
-       @%append $(OBJS)\widget.lbc option caseexact\r
-       @%append $(OBJS)\widget.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widget.lbc library %i\r
-       @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res\r
-       @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i\r
-       wlink @$(OBJS)\widget.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\widget_widget.obj :  .AUTODEPEND .\widget.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $<\r
-\r
-$(OBJS)\widget_widget.res :  .AUTODEPEND .\widget.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+WIDGET_OBJECTS =  &
+       $(OBJS)\widget_widget.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\widget.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
+
+$(OBJS)\widget.exe :  $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
+       @%create $(OBJS)\widget.lbc
+       @%append $(OBJS)\widget.lbc option quiet
+       @%append $(OBJS)\widget.lbc name $^@
+       @%append $(OBJS)\widget.lbc option caseexact
+       @%append $(OBJS)\widget.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widget.lbc library %i
+       @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res
+       @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i
+       wlink @$(OBJS)\widget.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\widget_widget.obj :  .AUTODEPEND .\widget.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $<
+
+$(OBJS)\widget_widget.res :  .AUTODEPEND .\widget.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp
index 01729c863ca05882bddfb3ae94f636760766a070..afef0adaf34401dec6906e859f5f1ab5a3b77e95 100644 (file)
--- a/samples/html/widget/widget.dsp
+++ b/samples/html/widget/widget.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\widget"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\widget"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\widget"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\widget"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj
index fb6fd5c89acdb383edaa6f9b30c9f61481462227..640924eb9bc76fe41bc7dd701bd9d8a3d592f8b2 100644 (file)
--- a/samples/html/widget/widget_vc7.vcproj
+++ b/samples/html/widget/widget_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\widget.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\widget.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\widget.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\widget.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj
index 9e6abd7c574eeb82ba888decd3b5f1136e2719fa..be2edc46818fd5574d1d455176640d19c6bb7fc8 100644 (file)
--- a/samples/html/widget/widget_vc8.vcproj
+++ b/samples/html/widget/widget_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj
index ad6fd66db5aefe1ead86b624aa3d0f3771f60bc6..afb7ee2c89ab07704135fac5e3f7f1b292173ca3 100644 (file)
--- a/samples/html/widget/widget_vc9.vcproj
+++ b/samples/html/widget/widget_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widget.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\widget.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 9f3a5689b9fc396c56b67a4c1fc97aff466adccc..f065aa2f12246f367fdbb9946b1e2309deb55873 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc
index 56c3655de2b50c55a453a3deb22fce86835cbccb..efff0d97c2c1d0f3bf0d03fe4b1642da8a6bebf7 100644 (file)
--- a/samples/html/zip/makefile.bcc
+++ b/samples/html/zip/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ZIP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ZIP_OBJECTS =  \\r
-       $(OBJS)\zip_zip.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\zip.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
-       -if exist $(OBJS)\zip.tds del $(OBJS)\zip.tds\r
-       -if exist $(OBJS)\zip.ilc del $(OBJS)\zip.ilc\r
-       -if exist $(OBJS)\zip.ild del $(OBJS)\zip.ild\r
-       -if exist $(OBJS)\zip.ilf del $(OBJS)\zip.ilf\r
-       -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils\r
-\r
-$(OBJS)\zip.exe: $(ZIP_OBJECTS)  $(OBJS)\zip_zip.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_zip.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\zip_zip.obj: .\zip.cpp\r
-       $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
-\r
-$(OBJS)\zip_zip.res: .\zip.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\zip.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ZIP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ZIP_OBJECTS =  \
+       $(OBJS)\zip_zip.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\zip.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
+       -if exist $(OBJS)\zip.tds del $(OBJS)\zip.tds
+       -if exist $(OBJS)\zip.ilc del $(OBJS)\zip.ilc
+       -if exist $(OBJS)\zip.ild del $(OBJS)\zip.ild
+       -if exist $(OBJS)\zip.ilf del $(OBJS)\zip.ilf
+       -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils
+
+$(OBJS)\zip.exe: $(ZIP_OBJECTS)  $(OBJS)\zip_zip.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_zip.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\zip_zip.obj: .\zip.cpp
+       $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp
+
+$(OBJS)\zip_zip.res: .\zip.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\zip.rc
+

diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index d3edd153d8cc45ba0d82d72ec54a93ad32e4fff0..3be0cf9f18121b83fbcdfb5d9575d4db18b89b03 100644 (file)
--- a/samples/html/zip/makefile.gcc
+++ b/samples/html/zip/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ZIP_OBJECTS =  \\r
-       $(OBJS)\zip_zip.o \\r
-       $(OBJS)\zip_zip_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\zip.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
-\r
-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o\r
-       $(CXX) -o $@ $(ZIP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\zip_zip.o: ./zip.cpp\r
-       $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\zip_zip_rc.o: ./zip.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ZIP_OBJECTS =  \
+       $(OBJS)\zip_zip.o \
+       $(OBJS)\zip_zip_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\zip.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
+
+$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o
+       $(CXX) -o $@ $(ZIP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\zip_zip.o: ./zip.cpp
+       $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\zip_zip_rc.o: ./zip.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx
index a917414589731ba2746171fea4d6db90aaafb8cd..9139463d87d31e2d6ad564046acf881319ea4944 100644 (file)
--- a/samples/html/zip/makefile.unx
+++ b/samples/html/zip/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 5e7a32ca40361ba0502de671c845756036a0a70a..2a9243bf8c17cfe26b0776259d2f37800d61baa8 100644 (file)
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-ZIP_OBJECTS =  \\r
-       $(OBJS)\zip_zip.obj \\r
-       $(OBJS)\zip_zip.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\zip.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
-       -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk\r
-       -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb\r
-\r
-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ZIP_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\zip_zip.obj: .\zip.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
-\r
-$(OBJS)\zip_zip.res: .\zip.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ZIP_OBJECTS =  \
+       $(OBJS)\zip_zip.obj
+ZIP_RESOURCES =  \
+       $(OBJS)\zip_zip.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\zip.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
+       -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk
+       -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb
+
+$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ZIP_OBJECTS) $(ZIP_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\zip_zip.obj: .\zip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp
+
+$(OBJS)\zip_zip.res: .\zip.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc
+

diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 26f2a0d1a82f1720ad2e538aeb78a261320864bf..9fa693c496d04dc2986aabc8ee0c4c763cfd47d7 100644 (file)
--- a/samples/html/zip/makefile.wat
+++ b/samples/html/zip/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-ZIP_OBJECTS =  &\r
-       $(OBJS)\zip_zip.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\zip.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
-\r
-$(OBJS)\zip.exe :  $(ZIP_OBJECTS) $(OBJS)\zip_zip.res\r
-       @%create $(OBJS)\zip.lbc\r
-       @%append $(OBJS)\zip.lbc option quiet\r
-       @%append $(OBJS)\zip.lbc name $^@\r
-       @%append $(OBJS)\zip.lbc option caseexact\r
-       @%append $(OBJS)\zip.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\zip.lbc library %i\r
-       @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res\r
-       @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i\r
-       wlink @$(OBJS)\zip.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\zip_zip.obj :  .AUTODEPEND .\zip.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $<\r
-\r
-$(OBJS)\zip_zip.res :  .AUTODEPEND .\zip.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+ZIP_OBJECTS =  &
+       $(OBJS)\zip_zip.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\zip.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
+
+$(OBJS)\zip.exe :  $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
+       @%create $(OBJS)\zip.lbc
+       @%append $(OBJS)\zip.lbc option quiet
+       @%append $(OBJS)\zip.lbc name $^@
+       @%append $(OBJS)\zip.lbc option caseexact
+       @%append $(OBJS)\zip.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\zip.lbc library %i
+       @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res
+       @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i
+       wlink @$(OBJS)\zip.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\zip_zip.obj :  .AUTODEPEND .\zip.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $<
+
+$(OBJS)\zip_zip.res :  .AUTODEPEND .\zip.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp
index f92702d23cc78bba544142ae2bbb3f377f17ef87..7a402bb261fcb12387e705add13a75b999044938 100644 (file)
--- a/samples/html/zip/zip.dsp
+++ b/samples/html/zip/zip.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\zip"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\zip"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\zip"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\zip"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj
index 9d7db8183a4cbc21ff76a8e4424651e852bce16c..cd0d6d0af3aa333ea1e9543f42bb5a22f4c17dfc 100644 (file)
--- a/samples/html/zip/zip_vc7.vcproj
+++ b/samples/html/zip/zip_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\zip.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\zip.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\zip.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\zip.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj
index ff8367495b93728a0e7dec1d0c4bed0475e6e533..72b245647160dd66d182c1caaa5611b9f5d7afba 100644 (file)
--- a/samples/html/zip/zip_vc8.vcproj
+++ b/samples/html/zip/zip_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj
index 5f26bfa2a761d4c78b3728afc0b62b8f478c2acc..770e28f1b3f5e3a9c4325610f8a8d5643a5ab7d1 100644 (file)
--- a/samples/html/zip/zip_vc9.vcproj
+++ b/samples/html/zip/zip_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\zip.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\zip.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 45fced7fcdb4e3e83fcb4c6206ec4e4fc0d7eaa3..ba1b2f86317517547b21534630d6f74aa2922d7c 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/image/image.dsp b/samples/image/image.dsp
index a72dceaf758d9e2c4d3a9ca3d66c89d953f198d0..00da48c16d860197e7961146302b6545a93cb789 100644 (file)
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\image"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\image"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\image"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\image"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\image.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\image.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj
index c6d4ce22695cb0a10f8c16b61c07bebb31094df2..35a04e07902378a0bea67779968bef762725681c 100644 (file)
--- a/samples/image/image_vc7.vcproj
+++ b/samples/image/image_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\image.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\image.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\image.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\image.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index 17e7206bea168d05079a21133b4084db524fe043..43b4c49c0d55d63fe4e4395ca3dd328e24140ad9 100644 (file)
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj
index 0224f3257e609eca39e1cec87c872b7e3a8f7322..adbb39d1bbb229a53294aa2a536d48a5dc75e299 100644 (file)
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\image.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\image.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index 4fd4f598725fdcc85f5ebbd2ee19aa6d9129226f..ee8a7bec80a7ee6d0c1e628d34287c0e72c2eb84 100644 (file)
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-IMAGE_OBJECTS =  \\r
-       $(OBJS)\image_image.obj \\r
-       $(OBJS)\image_canvas.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\image.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
-       -if exist $(OBJS)\image.tds del $(OBJS)\image.tds\r
-       -if exist $(OBJS)\image.ilc del $(OBJS)\image.ilc\r
-       -if exist $(OBJS)\image.ild del $(OBJS)\image.ild\r
-       -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf\r
-       -if exist $(OBJS)\image.ils del $(OBJS)\image.ils\r
-\r
-$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\image_image.obj: .\image.cpp\r
-       $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
-\r
-$(OBJS)\image_canvas.obj: .\canvas.cpp\r
-       $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
-\r
-$(OBJS)\image_image.res: .\image.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+IMAGE_OBJECTS =  \
+       $(OBJS)\image_image.obj \
+       $(OBJS)\image_canvas.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\image.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe
+       -if exist $(OBJS)\image.tds del $(OBJS)\image.tds
+       -if exist $(OBJS)\image.ilc del $(OBJS)\image.ilc
+       -if exist $(OBJS)\image.ild del $(OBJS)\image.ild
+       -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf
+       -if exist $(OBJS)\image.ils del $(OBJS)\image.ils
+
+$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\image_image.obj: .\image.cpp
+       $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
+
+$(OBJS)\image_canvas.obj: .\canvas.cpp
+       $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
+
+$(OBJS)\image_image.res: .\image.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
+

diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index 129ee4373feafc2a25372408444c591b4e062f80..5d76fa00ca2f6e985b6fb4a38e248678fbadc0ba 100644 (file)
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-IMAGE_OBJECTS =  \\r
-       $(OBJS)\image_image.o \\r
-       $(OBJS)\image_canvas.o \\r
-       $(OBJS)\image_image_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\image.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
-\r
-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o\r
-       $(CXX) -o $@ $(IMAGE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\image_image.o: ./image.cpp\r
-       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\image_canvas.o: ./canvas.cpp\r
-       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\image_image_rc.o: ./image.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+IMAGE_OBJECTS =  \
+       $(OBJS)\image_image.o \
+       $(OBJS)\image_canvas.o \
+       $(OBJS)\image_image_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\image.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe
+
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o
+       $(CXX) -o $@ $(IMAGE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\image_image.o: ./image.cpp
+       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\image_canvas.o: ./canvas.cpp
+       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\image_image_rc.o: ./image.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
index 3cb452d3de44d24c512b6f10e27c3bae9698dc32..7d19408d34c840ad4a3d6dc7a24527849f0386c8 100644 (file)
--- a/samples/image/makefile.unx
+++ b/samples/image/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 29f715259bf1b49d3ec64b8f980bb4e3d99105c8..299d73aa93741068d341210831ff530357813215 100644 (file)
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-IMAGE_OBJECTS =  \\r
-       $(OBJS)\image_image.obj \\r
-       $(OBJS)\image_canvas.obj \\r
-       $(OBJS)\image_image.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\image.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
-       -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk\r
-       -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb\r
-\r
-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(IMAGE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\image_image.obj: .\image.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
-\r
-$(OBJS)\image_canvas.obj: .\canvas.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
-\r
-$(OBJS)\image_image.res: .\image.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+IMAGE_OBJECTS =  \
+       $(OBJS)\image_image.obj \
+       $(OBJS)\image_canvas.obj
+IMAGE_RESOURCES =  \
+       $(OBJS)\image_image.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\image.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe
+       -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk
+       -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb
+
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(IMAGE_OBJECTS) $(IMAGE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\image_image.obj: .\image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp
+
+$(OBJS)\image_canvas.obj: .\canvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
+
+$(OBJS)\image_image.res: .\image.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc
+

diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 241a607fa29f2315285e6bbc3bdb5dd0a5ba5615..ba9b3fb7ab1dbab3d68102692c2d8f131ad40244 100644 (file)
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -1,268 +1,268 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-IMAGE_OBJECTS =  &\r
-       $(OBJS)\image_image.obj &\r
-       $(OBJS)\image_canvas.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\image.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
-\r
-$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_image.res\r
-       @%create $(OBJS)\image.lbc\r
-       @%append $(OBJS)\image.lbc option quiet\r
-       @%append $(OBJS)\image.lbc name $^@\r
-       @%append $(OBJS)\image.lbc option caseexact\r
-       @%append $(OBJS)\image.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i\r
-       @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res\r
-       @for %i in () do @%append $(OBJS)\image.lbc option stack=%i\r
-       wlink @$(OBJS)\image.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\image_image.obj :  .AUTODEPEND .\image.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
-\r
-$(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
-\r
-$(OBJS)\image_image.res :  .AUTODEPEND .\image.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+IMAGE_OBJECTS =  &
+       $(OBJS)\image_image.obj &
+       $(OBJS)\image_canvas.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\image.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe
+
+$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+       @%create $(OBJS)\image.lbc
+       @%append $(OBJS)\image.lbc option quiet
+       @%append $(OBJS)\image.lbc name $^@
+       @%append $(OBJS)\image.lbc option caseexact
+       @%append $(OBJS)\image.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i
+       @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res
+       @for %i in () do @%append $(OBJS)\image.lbc option stack=%i
+       wlink @$(OBJS)\image.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\image_image.obj :  .AUTODEPEND .\image.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
+
+$(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
+
+$(OBJS)\image_image.res :  .AUTODEPEND .\image.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index b21abe5d0df24264bf8c9fe7d06fe2d11bb229b9..b4b9b70fcf8ebc345c8ba02d5da33a6a7feeee64 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp
index 9fec7d3c3884931e7be927fe3ca0b0f3b8800c3a..cb7f236296ced3499da0624ba2c0bdbaee3f9536 100644 (file)
--- a/samples/internat/internat.dsp
+++ b/samples/internat/internat.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\internat"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\internat"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\internat"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\internat"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj
index fa2ee2e0b3d924b47e05c7313d1b292034ec85b6..04505c8534cedf80fa59c64aee3f38b44f07d7e5 100644 (file)
--- a/samples/internat/internat_vc7.vcproj
+++ b/samples/internat/internat_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\internat.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\internat.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\internat.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\internat.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj
index bccfbd702056e94538fffe170f55507db6d0dad7..dc529ad3ad0bb541419a35e637e6eb91f75a645f 100644 (file)
--- a/samples/internat/internat_vc8.vcproj
+++ b/samples/internat/internat_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/internat/internat_vc9.vcproj b/samples/internat/internat_vc9.vcproj
index 96daed896cefe0d0aef97821d691681d1e952993..128fef7ba559d0cee3e48ce777c17b89d050051b 100644 (file)
--- a/samples/internat/internat_vc9.vcproj
+++ b/samples/internat/internat_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\internat.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\internat.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index e1f70dfbc1228296a8ddda019e8abfc733891c3c..29935e40ba6abade051c78e7fdb4ec15a97300a3 100644 (file)
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -1,280 +1,280 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-INTERNAT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-INTERNAT_OBJECTS =  \\r
-       $(OBJS)\internat_internat.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
-       -if exist $(OBJS)\internat.tds del $(OBJS)\internat.tds\r
-       -if exist $(OBJS)\internat.ilc del $(OBJS)\internat.ilc\r
-       -if exist $(OBJS)\internat.ild del $(OBJS)\internat.ild\r
-       -if exist $(OBJS)\internat.ilf del $(OBJS)\internat.ilf\r
-       -if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils\r
-\r
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS)  $(OBJS)\internat_internat.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_internat.res\r
-|\r
-\r
-ar: \r
-       if not exist $(OBJS)\ar mkdir $(OBJS)\ar\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar\r
-\r
-bg: \r
-       if not exist $(OBJS)\bg mkdir $(OBJS)\bg\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg\r
-\r
-cs: \r
-       if not exist $(OBJS)\cs mkdir $(OBJS)\cs\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs\r
-\r
-de: \r
-       if not exist $(OBJS)\de mkdir $(OBJS)\de\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de\r
-\r
-fr: \r
-       if not exist $(OBJS)\fr mkdir $(OBJS)\fr\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr\r
-\r
-it: \r
-       if not exist $(OBJS)\it mkdir $(OBJS)\it\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it\r
-\r
-ka: \r
-       if not exist $(OBJS)\ka mkdir $(OBJS)\ka\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka\r
-\r
-pl: \r
-       if not exist $(OBJS)\pl mkdir $(OBJS)\pl\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl\r
-\r
-ru: \r
-       if not exist $(OBJS)\ru mkdir $(OBJS)\ru\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru\r
-\r
-sv: \r
-       if not exist $(OBJS)\sv mkdir $(OBJS)\sv\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv\r
-\r
-ja: \r
-       if not exist $(OBJS)\ja mkdir $(OBJS)\ja\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja\r
-\r
-ja_JP.EUC-JP: \r
-       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP\r
-\r
-$(OBJS)\internat_internat.obj: .\internat.cpp\r
-       $(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
-\r
-$(OBJS)\internat_internat.res: .\internat.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\internat.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+INTERNAT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+INTERNAT_OBJECTS =  \
+       $(OBJS)\internat_internat.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
+       -if exist $(OBJS)\internat.tds del $(OBJS)\internat.tds
+       -if exist $(OBJS)\internat.ilc del $(OBJS)\internat.ilc
+       -if exist $(OBJS)\internat.ild del $(OBJS)\internat.ild
+       -if exist $(OBJS)\internat.ilf del $(OBJS)\internat.ilf
+       -if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils
+
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS)  $(OBJS)\internat_internat.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_internat.res
+|
+
+ar: 
+       if not exist $(OBJS)\ar mkdir $(OBJS)\ar
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
+
+bg: 
+       if not exist $(OBJS)\bg mkdir $(OBJS)\bg
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
+
+cs: 
+       if not exist $(OBJS)\cs mkdir $(OBJS)\cs
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs
+
+de: 
+       if not exist $(OBJS)\de mkdir $(OBJS)\de
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de
+
+fr: 
+       if not exist $(OBJS)\fr mkdir $(OBJS)\fr
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr
+
+it: 
+       if not exist $(OBJS)\it mkdir $(OBJS)\it
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it
+
+ka: 
+       if not exist $(OBJS)\ka mkdir $(OBJS)\ka
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka
+
+pl: 
+       if not exist $(OBJS)\pl mkdir $(OBJS)\pl
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl
+
+ru: 
+       if not exist $(OBJS)\ru mkdir $(OBJS)\ru
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru
+
+sv: 
+       if not exist $(OBJS)\sv mkdir $(OBJS)\sv
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv
+
+ja: 
+       if not exist $(OBJS)\ja mkdir $(OBJS)\ja
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja
+
+ja_JP.EUC-JP: 
+       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+
+$(OBJS)\internat_internat.obj: .\internat.cpp
+       $(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) .\internat.cpp
+
+$(OBJS)\internat_internat.res: .\internat.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\internat.rc
+

diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index 76155877b8244c52400596f49f52f7d9445091eb..6e61efb8559879b28f7471aa2c423a71e7fe997b 100644 (file)
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -1,274 +1,274 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-INTERNAT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-INTERNAT_OBJECTS =  \\r
-       $(OBJS)\internat_internat.o \\r
-       $(OBJS)\internat_internat_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
-\r
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o\r
-       $(CXX) -o $@ $(INTERNAT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-ar: \r
-       if not exist $(OBJS)\ar mkdir $(OBJS)\ar\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%%f copy .\ar\%%f $(OBJS)\ar\r
-\r
-bg: \r
-       if not exist $(OBJS)\bg mkdir $(OBJS)\bg\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%%f copy .\bg\%%f $(OBJS)\bg\r
-\r
-cs: \r
-       if not exist $(OBJS)\cs mkdir $(OBJS)\cs\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%%f copy .\cs\%%f $(OBJS)\cs\r
-\r
-de: \r
-       if not exist $(OBJS)\de mkdir $(OBJS)\de\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\de\%%f copy .\de\%%f $(OBJS)\de\r
-\r
-fr: \r
-       if not exist $(OBJS)\fr mkdir $(OBJS)\fr\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%%f copy .\fr\%%f $(OBJS)\fr\r
-\r
-it: \r
-       if not exist $(OBJS)\it mkdir $(OBJS)\it\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\it\%%f copy .\it\%%f $(OBJS)\it\r
-\r
-ka: \r
-       if not exist $(OBJS)\ka mkdir $(OBJS)\ka\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%%f copy .\ka\%%f $(OBJS)\ka\r
-\r
-pl: \r
-       if not exist $(OBJS)\pl mkdir $(OBJS)\pl\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%%f copy .\pl\%%f $(OBJS)\pl\r
-\r
-ru: \r
-       if not exist $(OBJS)\ru mkdir $(OBJS)\ru\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%%f copy .\ru\%%f $(OBJS)\ru\r
-\r
-sv: \r
-       if not exist $(OBJS)\sv mkdir $(OBJS)\sv\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%%f copy .\sv\%%f $(OBJS)\sv\r
-\r
-ja: \r
-       if not exist $(OBJS)\ja mkdir $(OBJS)\ja\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%%f copy .\ja\%%f $(OBJS)\ja\r
-\r
-ja_JP.EUC-JP: \r
-       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
-       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%%f copy .\ja_JP.EUC-JP\%%f $(OBJS)\ja_JP.EUC-JP\r
-\r
-$(OBJS)\internat_internat.o: ./internat.cpp\r
-       $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\internat_internat_rc.o: ./internat.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+INTERNAT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+INTERNAT_OBJECTS =  \
+       $(OBJS)\internat_internat.o \
+       $(OBJS)\internat_internat_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
+
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o
+       $(CXX) -o $@ $(INTERNAT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+ar: 
+       if not exist $(OBJS)\ar mkdir $(OBJS)\ar
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%%f copy .\ar\%%f $(OBJS)\ar
+
+bg: 
+       if not exist $(OBJS)\bg mkdir $(OBJS)\bg
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%%f copy .\bg\%%f $(OBJS)\bg
+
+cs: 
+       if not exist $(OBJS)\cs mkdir $(OBJS)\cs
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%%f copy .\cs\%%f $(OBJS)\cs
+
+de: 
+       if not exist $(OBJS)\de mkdir $(OBJS)\de
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\de\%%f copy .\de\%%f $(OBJS)\de
+
+fr: 
+       if not exist $(OBJS)\fr mkdir $(OBJS)\fr
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%%f copy .\fr\%%f $(OBJS)\fr
+
+it: 
+       if not exist $(OBJS)\it mkdir $(OBJS)\it
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\it\%%f copy .\it\%%f $(OBJS)\it
+
+ka: 
+       if not exist $(OBJS)\ka mkdir $(OBJS)\ka
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%%f copy .\ka\%%f $(OBJS)\ka
+
+pl: 
+       if not exist $(OBJS)\pl mkdir $(OBJS)\pl
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%%f copy .\pl\%%f $(OBJS)\pl
+
+ru: 
+       if not exist $(OBJS)\ru mkdir $(OBJS)\ru
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%%f copy .\ru\%%f $(OBJS)\ru
+
+sv: 
+       if not exist $(OBJS)\sv mkdir $(OBJS)\sv
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%%f copy .\sv\%%f $(OBJS)\sv
+
+ja: 
+       if not exist $(OBJS)\ja mkdir $(OBJS)\ja
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%%f copy .\ja\%%f $(OBJS)\ja
+
+ja_JP.EUC-JP: 
+       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%%f copy .\ja_JP.EUC-JP\%%f $(OBJS)\ja_JP.EUC-JP
+
+$(OBJS)\internat_internat.o: ./internat.cpp
+       $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\internat_internat_rc.o: ./internat.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx
index ef92b5b59d5c0520119e64d0749277aeab050cd7..b3df1f213dc959949010451553697b7ce612843e 100644 (file)
--- a/samples/internat/makefile.unx
+++ b/samples/internat/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 710182bcfecd1e32d476e991620d08f8a3214070..6433f683bbd6b4c83e75529f3762691b42b7e545 100644 (file)
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -1,359 +1,384 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-INTERNAT_OBJECTS =  \\r
-       $(OBJS)\internat_internat.obj \\r
-       $(OBJS)\internat_internat.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
-       -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk\r
-       -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb\r
-\r
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(INTERNAT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-ar: \r
-       if not exist $(OBJS)\ar mkdir $(OBJS)\ar\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar\r
-\r
-bg: \r
-       if not exist $(OBJS)\bg mkdir $(OBJS)\bg\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg\r
-\r
-cs: \r
-       if not exist $(OBJS)\cs mkdir $(OBJS)\cs\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs\r
-\r
-de: \r
-       if not exist $(OBJS)\de mkdir $(OBJS)\de\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de\r
-\r
-fr: \r
-       if not exist $(OBJS)\fr mkdir $(OBJS)\fr\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr\r
-\r
-it: \r
-       if not exist $(OBJS)\it mkdir $(OBJS)\it\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it\r
-\r
-ka: \r
-       if not exist $(OBJS)\ka mkdir $(OBJS)\ka\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka\r
-\r
-pl: \r
-       if not exist $(OBJS)\pl mkdir $(OBJS)\pl\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl\r
-\r
-ru: \r
-       if not exist $(OBJS)\ru mkdir $(OBJS)\ru\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru\r
-\r
-sv: \r
-       if not exist $(OBJS)\sv mkdir $(OBJS)\sv\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv\r
-\r
-ja: \r
-       if not exist $(OBJS)\ja mkdir $(OBJS)\ja\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja\r
-\r
-ja_JP.EUC-JP: \r
-       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP\r
-\r
-$(OBJS)\internat_internat.obj: .\internat.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
-\r
-$(OBJS)\internat_internat.res: .\internat.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\internat.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+INTERNAT_OBJECTS =  \
+       $(OBJS)\internat_internat.obj
+INTERNAT_RESOURCES =  \
+       $(OBJS)\internat_internat.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
+       -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk
+       -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb
+
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(INTERNAT_OBJECTS) $(INTERNAT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+ar: 
+       if not exist $(OBJS)\ar mkdir $(OBJS)\ar
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
+
+bg: 
+       if not exist $(OBJS)\bg mkdir $(OBJS)\bg
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
+
+cs: 
+       if not exist $(OBJS)\cs mkdir $(OBJS)\cs
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs
+
+de: 
+       if not exist $(OBJS)\de mkdir $(OBJS)\de
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de
+
+fr: 
+       if not exist $(OBJS)\fr mkdir $(OBJS)\fr
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr
+
+it: 
+       if not exist $(OBJS)\it mkdir $(OBJS)\it
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it
+
+ka: 
+       if not exist $(OBJS)\ka mkdir $(OBJS)\ka
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka
+
+pl: 
+       if not exist $(OBJS)\pl mkdir $(OBJS)\pl
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl
+
+ru: 
+       if not exist $(OBJS)\ru mkdir $(OBJS)\ru
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru
+
+sv: 
+       if not exist $(OBJS)\sv mkdir $(OBJS)\sv
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv
+
+ja: 
+       if not exist $(OBJS)\ja mkdir $(OBJS)\ja
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja
+
+ja_JP.EUC-JP: 
+       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+
+$(OBJS)\internat_internat.obj: .\internat.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp
+
+$(OBJS)\internat_internat.res: .\internat.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\internat.rc
+

diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index 78eb744a95046bff236d303fbd7016c6dd99270d..30cd81225dc92347625e1b6c346cd52a6c36359d 100644 (file)
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -1,308 +1,308 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-INTERNAT_OBJECTS =  &\r
-       $(OBJS)\internat_internat.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
-\r
-$(OBJS)\internat.exe :  $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res\r
-       @%create $(OBJS)\internat.lbc\r
-       @%append $(OBJS)\internat.lbc option quiet\r
-       @%append $(OBJS)\internat.lbc name $^@\r
-       @%append $(OBJS)\internat.lbc option caseexact\r
-       @%append $(OBJS)\internat.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\internat.lbc library %i\r
-       @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res\r
-       @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i\r
-       wlink @$(OBJS)\internat.lbc\r
-\r
-ar : .SYMBOLIC \r
-       if not exist $(OBJS)\ar mkdir $(OBJS)\ar\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar\r
-\r
-bg : .SYMBOLIC \r
-       if not exist $(OBJS)\bg mkdir $(OBJS)\bg\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg\r
-\r
-cs : .SYMBOLIC \r
-       if not exist $(OBJS)\cs mkdir $(OBJS)\cs\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs\r
-\r
-de : .SYMBOLIC \r
-       if not exist $(OBJS)\de mkdir $(OBJS)\de\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de\r
-\r
-fr : .SYMBOLIC \r
-       if not exist $(OBJS)\fr mkdir $(OBJS)\fr\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr\r
-\r
-it : .SYMBOLIC \r
-       if not exist $(OBJS)\it mkdir $(OBJS)\it\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it\r
-\r
-ka : .SYMBOLIC \r
-       if not exist $(OBJS)\ka mkdir $(OBJS)\ka\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka\r
-\r
-pl : .SYMBOLIC \r
-       if not exist $(OBJS)\pl mkdir $(OBJS)\pl\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl\r
-\r
-ru : .SYMBOLIC \r
-       if not exist $(OBJS)\ru mkdir $(OBJS)\ru\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru\r
-\r
-sv : .SYMBOLIC \r
-       if not exist $(OBJS)\sv mkdir $(OBJS)\sv\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv\r
-\r
-ja : .SYMBOLIC \r
-       if not exist $(OBJS)\ja mkdir $(OBJS)\ja\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja\r
-\r
-ja_JP.EUC-JP : .SYMBOLIC \r
-       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
-       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP\r
-\r
-$(OBJS)\internat_internat.obj :  .AUTODEPEND .\internat.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $<\r
-\r
-$(OBJS)\internat_internat.res :  .AUTODEPEND .\internat.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+INTERNAT_OBJECTS =  &
+       $(OBJS)\internat_internat.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
+
+$(OBJS)\internat.exe :  $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
+       @%create $(OBJS)\internat.lbc
+       @%append $(OBJS)\internat.lbc option quiet
+       @%append $(OBJS)\internat.lbc name $^@
+       @%append $(OBJS)\internat.lbc option caseexact
+       @%append $(OBJS)\internat.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\internat.lbc library %i
+       @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res
+       @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i
+       wlink @$(OBJS)\internat.lbc
+
+ar : .SYMBOLIC 
+       if not exist $(OBJS)\ar mkdir $(OBJS)\ar
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar
+
+bg : .SYMBOLIC 
+       if not exist $(OBJS)\bg mkdir $(OBJS)\bg
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg
+
+cs : .SYMBOLIC 
+       if not exist $(OBJS)\cs mkdir $(OBJS)\cs
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs
+
+de : .SYMBOLIC 
+       if not exist $(OBJS)\de mkdir $(OBJS)\de
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de
+
+fr : .SYMBOLIC 
+       if not exist $(OBJS)\fr mkdir $(OBJS)\fr
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr
+
+it : .SYMBOLIC 
+       if not exist $(OBJS)\it mkdir $(OBJS)\it
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it
+
+ka : .SYMBOLIC 
+       if not exist $(OBJS)\ka mkdir $(OBJS)\ka
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka
+
+pl : .SYMBOLIC 
+       if not exist $(OBJS)\pl mkdir $(OBJS)\pl
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl
+
+ru : .SYMBOLIC 
+       if not exist $(OBJS)\ru mkdir $(OBJS)\ru
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru
+
+sv : .SYMBOLIC 
+       if not exist $(OBJS)\sv mkdir $(OBJS)\sv
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv
+
+ja : .SYMBOLIC 
+       if not exist $(OBJS)\ja mkdir $(OBJS)\ja
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja
+
+ja_JP.EUC-JP : .SYMBOLIC 
+       if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
+       for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+
+$(OBJS)\internat_internat.obj :  .AUTODEPEND .\internat.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $<
+
+$(OBJS)\internat_internat.res :  .AUTODEPEND .\internat.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 8de9f7a7b8088d3bceb36d10cf9704cc3edb59cb..70f5a594f46486113df08f994f0e8c84ca6dc137 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ipc/ipc_baseipcclient.dsp b/samples/ipc/ipc_baseipcclient.dsp
index 61e42d4fe28e5d1b7ac72ffd15a864bb901d3215..9053e2fcf430b1d324fe3aa8d6fef9b4bc8f3839 100644 (file)
--- a/samples/ipc/ipc_baseipcclient.dsp
+++ b/samples/ipc/ipc_baseipcclient.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\baseipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\baseipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\baseipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\baseipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/samples/ipc/ipc_baseipcserver.dsp b/samples/ipc/ipc_baseipcserver.dsp
index 48c93b71bbff4418d1301a844c5bbdfc48d9835a..149d97a77a8491cccf30e7d41601f4e985dd1297 100644 (file)
--- a/samples/ipc/ipc_baseipcserver.dsp
+++ b/samples/ipc/ipc_baseipcserver.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\baseipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\baseipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\baseipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\baseipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/samples/ipc/ipc_ipcclient.dsp b/samples/ipc/ipc_ipcclient.dsp
index 2037d3660875e92565ce6fa9e9054f5499ee2f5a..a061879cbb7183f14fee1c1f46623a15b8759b7a 100644 (file)
--- a/samples/ipc/ipc_ipcclient.dsp
+++ b/samples/ipc/ipc_ipcclient.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\ipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\ipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\ipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\ipcclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/ipc/ipc_ipcserver.dsp b/samples/ipc/ipc_ipcserver.dsp
index 1bb9457cfb62a205beef00142bb4ef97c25d4f03..03ea97bf5647e2679159775ef9264b4309d9c02e 100644 (file)
--- a/samples/ipc/ipc_ipcserver.dsp
+++ b/samples/ipc/ipc_ipcserver.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\ipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\ipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\ipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\ipcserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/ipc/ipc_vc7_baseipcclient.vcproj b/samples/ipc/ipc_vc7_baseipcclient.vcproj
index ded4c8010937407a17eb49c0c346be5a1450e71a..adbe82eb2ff9ee2c8e512a7dfb87257c19b54cd7 100644 (file)
--- a/samples/ipc/ipc_vc7_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\baseipcclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/samples/ipc/ipc_vc7_baseipcserver.vcproj b/samples/ipc/ipc_vc7_baseipcserver.vcproj
index 8853870060c332089a1e76865e82c41c976d3b1a..3797bef8b11f41479790fa8d0176808081e9fe53 100644 (file)
--- a/samples/ipc/ipc_vc7_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\baseipcserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/samples/ipc/ipc_vc7_ipcclient.vcproj b/samples/ipc/ipc_vc7_ipcclient.vcproj
index f1ed9d7aa9fc03133fcbcf1e33733d458a376800..257fc2993beba010faa9ec28a2b50da52201ed99 100644 (file)
--- a/samples/ipc/ipc_vc7_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_ipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\ipcclient.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\ipcclient.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/ipc/ipc_vc7_ipcserver.vcproj b/samples/ipc/ipc_vc7_ipcserver.vcproj
index 0d91b3f1f6fc99c79d6ec1197417a6e0577a1e9c..a3610ccb13377eb40d87a05dfcf51df86925fc15 100644 (file)
--- a/samples/ipc/ipc_vc7_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_ipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\ipcserver.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\ipcserver.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj
index 66f9f2b26031cd94b3d079148012282a373d449e..351dccef8f91bac44d708e12e0bb144fae8c43dd 100644 (file)
--- a/samples/ipc/ipc_vc8_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc8_baseipcserver.vcproj b/samples/ipc/ipc_vc8_baseipcserver.vcproj
index c9354216e5798b3f376211085149fad476097084..58a5eccd8f73a3d3dbd1a20bf7d5edeb8f13c746 100644 (file)
--- a/samples/ipc/ipc_vc8_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc8_ipcclient.vcproj b/samples/ipc/ipc_vc8_ipcclient.vcproj
index 8544ab5c94c492a5bcb468d236fc9873a2270693..2033c00233ada1adfba756e2a57c87de9a277c27 100644 (file)
--- a/samples/ipc/ipc_vc8_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_ipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj
index dc2a50766aafd4f4325a182242b5428ee8581780..647a687dc790e7d404f0603408e1141581314786 100644 (file)
--- a/samples/ipc/ipc_vc8_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_ipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc9_baseipcclient.vcproj b/samples/ipc/ipc_vc9_baseipcclient.vcproj
index 58107feaef9fc2b937db3d0af2ac8985ee51fffa..df26c4af5655ab43a5257a60f2f17647d5688c94 100644 (file)
--- a/samples/ipc/ipc_vc9_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc9_baseipcserver.vcproj b/samples/ipc/ipc_vc9_baseipcserver.vcproj
index 02918105494f6cc3927c4bfc8dd15760e9cbfbbc..87b18eb918597ab88fb561e24c59cee73f1612ba 100644 (file)
--- a/samples/ipc/ipc_vc9_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc9_ipcclient.vcproj b/samples/ipc/ipc_vc9_ipcclient.vcproj
index af4dcb5d76cc637b6bde2fc632da6a33594091c6..089014f7d30aefb0067accf06eaf36b098a4d65e 100644 (file)
--- a/samples/ipc/ipc_vc9_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_ipcclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/ipc_vc9_ipcserver.vcproj b/samples/ipc/ipc_vc9_ipcserver.vcproj
index 65a632132ecb0857296c05df7401c64a95145407..e3bd8ca6366e515f1432754998f84ec546d7257c 100644 (file)
--- a/samples/ipc/ipc_vc9_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_ipcserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ipcserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc
index 42440ca265450389841f891420e20e1aaf84046a..1d628e86272b5dc1d11f8f09a2abad8ad332a05f 100644 (file)
--- a/samples/ipc/makefile.bcc
+++ b/samples/ipc/makefile.bcc
@@ -1,315 +1,315 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IPCCLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-IPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\ipcclient_client.obj\r
-IPCSERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-IPCSERVER_OBJECTS =  \\r
-       $(OBJS)\ipcserver_server.obj\r
-BASEIPCCLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\baseipcclient_baseclient.obj\r
-BASEIPCSERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCSERVER_OBJECTS =  \\r
-       $(OBJS)\baseipcserver_baseserver.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__ipcclient___depname = $(OBJS)\ipcclient.exe\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__ipcserver___depname = $(OBJS)\ipcserver.exe\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_0 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_0 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_0 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_0 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_0 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_0 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_0 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_2 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_2 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_2 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_2 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe\r
-       -if exist $(OBJS)\ipcclient.tds del $(OBJS)\ipcclient.tds\r
-       -if exist $(OBJS)\ipcclient.ilc del $(OBJS)\ipcclient.ilc\r
-       -if exist $(OBJS)\ipcclient.ild del $(OBJS)\ipcclient.ild\r
-       -if exist $(OBJS)\ipcclient.ilf del $(OBJS)\ipcclient.ilf\r
-       -if exist $(OBJS)\ipcclient.ils del $(OBJS)\ipcclient.ils\r
-       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe\r
-       -if exist $(OBJS)\ipcserver.tds del $(OBJS)\ipcserver.tds\r
-       -if exist $(OBJS)\ipcserver.ilc del $(OBJS)\ipcserver.ilc\r
-       -if exist $(OBJS)\ipcserver.ild del $(OBJS)\ipcserver.ild\r
-       -if exist $(OBJS)\ipcserver.ilf del $(OBJS)\ipcserver.ilf\r
-       -if exist $(OBJS)\ipcserver.ils del $(OBJS)\ipcserver.ils\r
-       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe\r
-       -if exist $(OBJS)\baseipcclient.tds del $(OBJS)\baseipcclient.tds\r
-       -if exist $(OBJS)\baseipcclient.ilc del $(OBJS)\baseipcclient.ilc\r
-       -if exist $(OBJS)\baseipcclient.ild del $(OBJS)\baseipcclient.ild\r
-       -if exist $(OBJS)\baseipcclient.ilf del $(OBJS)\baseipcclient.ilf\r
-       -if exist $(OBJS)\baseipcclient.ils del $(OBJS)\baseipcclient.ils\r
-       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe\r
-       -if exist $(OBJS)\baseipcserver.tds del $(OBJS)\baseipcserver.tds\r
-       -if exist $(OBJS)\baseipcserver.ilc del $(OBJS)\baseipcserver.ilc\r
-       -if exist $(OBJS)\baseipcserver.ild del $(OBJS)\baseipcserver.ild\r
-       -if exist $(OBJS)\baseipcserver.ilf del $(OBJS)\baseipcserver.ilf\r
-       -if exist $(OBJS)\baseipcserver.ils del $(OBJS)\baseipcserver.ils\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS)  $(OBJS)\ipcclient_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(IPCCLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcclient_sample.res\r
-|\r
-!endif\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS)  $(OBJS)\ipcserver_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(IPCSERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcserver_sample.res\r
-|\r
-!endif\r
-\r
-$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BASEIPCCLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,\r
-|\r
-\r
-$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BASEIPCSERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,\r
-|\r
-\r
-$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\ipcclient_client.obj: .\client.cpp\r
-       $(CXX) -q -c -P -o$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp\r
-\r
-$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\ipcserver_server.obj: .\server.cpp\r
-       $(CXX) -q -c -P -o$@ $(IPCSERVER_CXXFLAGS) .\server.cpp\r
-\r
-$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp\r
-       $(CXX) -q -c -P -o$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp\r
-\r
-$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp\r
-       $(CXX) -q -c -P -o$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IPCCLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+IPCCLIENT_OBJECTS =  \
+       $(OBJS)\ipcclient_client.obj
+IPCSERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+IPCSERVER_OBJECTS =  \
+       $(OBJS)\ipcserver_server.obj
+BASEIPCCLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCCLIENT_OBJECTS =  \
+       $(OBJS)\baseipcclient_baseclient.obj
+BASEIPCSERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCSERVER_OBJECTS =  \
+       $(OBJS)\baseipcserver_baseserver.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_GUI)" == "1"
+__ipcclient___depname = $(OBJS)\ipcclient.exe
+!endif
+!if "$(USE_GUI)" == "1"
+__ipcserver___depname = $(OBJS)\ipcserver.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_0 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_0 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_0 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_0 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_0 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_0 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_0 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_2 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_2 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_2 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_2 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe
+       -if exist $(OBJS)\ipcclient.tds del $(OBJS)\ipcclient.tds
+       -if exist $(OBJS)\ipcclient.ilc del $(OBJS)\ipcclient.ilc
+       -if exist $(OBJS)\ipcclient.ild del $(OBJS)\ipcclient.ild
+       -if exist $(OBJS)\ipcclient.ilf del $(OBJS)\ipcclient.ilf
+       -if exist $(OBJS)\ipcclient.ils del $(OBJS)\ipcclient.ils
+       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe
+       -if exist $(OBJS)\ipcserver.tds del $(OBJS)\ipcserver.tds
+       -if exist $(OBJS)\ipcserver.ilc del $(OBJS)\ipcserver.ilc
+       -if exist $(OBJS)\ipcserver.ild del $(OBJS)\ipcserver.ild
+       -if exist $(OBJS)\ipcserver.ilf del $(OBJS)\ipcserver.ilf
+       -if exist $(OBJS)\ipcserver.ils del $(OBJS)\ipcserver.ils
+       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe
+       -if exist $(OBJS)\baseipcclient.tds del $(OBJS)\baseipcclient.tds
+       -if exist $(OBJS)\baseipcclient.ilc del $(OBJS)\baseipcclient.ilc
+       -if exist $(OBJS)\baseipcclient.ild del $(OBJS)\baseipcclient.ild
+       -if exist $(OBJS)\baseipcclient.ilf del $(OBJS)\baseipcclient.ilf
+       -if exist $(OBJS)\baseipcclient.ils del $(OBJS)\baseipcclient.ils
+       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe
+       -if exist $(OBJS)\baseipcserver.tds del $(OBJS)\baseipcserver.tds
+       -if exist $(OBJS)\baseipcserver.ilc del $(OBJS)\baseipcserver.ilc
+       -if exist $(OBJS)\baseipcserver.ild del $(OBJS)\baseipcserver.ild
+       -if exist $(OBJS)\baseipcserver.ilf del $(OBJS)\baseipcserver.ilf
+       -if exist $(OBJS)\baseipcserver.ils del $(OBJS)\baseipcserver.ils
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS)  $(OBJS)\ipcclient_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(IPCCLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcclient_sample.res
+|
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS)  $(OBJS)\ipcserver_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(IPCSERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcserver_sample.res
+|
+!endif
+
+$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(BASEIPCCLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+
+$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(BASEIPCSERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+
+$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\ipcclient_client.obj: .\client.cpp
+       $(CXX) -q -c -P -o$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp
+
+$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\ipcserver_server.obj: .\server.cpp
+       $(CXX) -q -c -P -o$@ $(IPCSERVER_CXXFLAGS) .\server.cpp
+
+$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp
+       $(CXX) -q -c -P -o$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp
+
+$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp
+       $(CXX) -q -c -P -o$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp
+

diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc
index 2a951c92542230156f03e66fbfac942cceb98d39..43cb2ce5be0b6dcfcb86662aad5d91dc80fabcef 100644 (file)
--- a/samples/ipc/makefile.gcc
+++ b/samples/ipc/makefile.gcc
@@ -1,292 +1,292 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-IPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\ipcclient_sample_rc.o \\r
-       $(OBJS)\ipcclient_client.o\r
-IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-IPCSERVER_OBJECTS =  \\r
-       $(OBJS)\ipcserver_sample_rc.o \\r
-       $(OBJS)\ipcserver_server.o\r
-BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\baseipcclient_baseclient.o\r
-BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCSERVER_OBJECTS =  \\r
-       $(OBJS)\baseipcserver_baseserver.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__ipcclient___depname = $(OBJS)\ipcclient.exe\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__ipcserver___depname = $(OBJS)\ipcserver.exe\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_0 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_0 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_0 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_0 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe\r
-       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe\r
-       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe\r
-       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe\r
-\r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample_rc.o\r
-       $(CXX) -o $@ $(IPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o\r
-       $(CXX) -o $@ $(IPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)\r
-       $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)\r
-       $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\ipcclient_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\ipcclient_client.o: ./client.cpp\r
-       $(CXX) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\ipcserver_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\ipcserver_server.o: ./server.cpp\r
-       $(CXX) -c -o $@ $(IPCSERVER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\baseipcclient_baseclient.o: ./baseclient.cpp\r
-       $(CXX) -c -o $@ $(BASEIPCCLIENT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\baseipcserver_baseserver.o: ./baseserver.cpp\r
-       $(CXX) -c -o $@ $(BASEIPCSERVER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+IPCCLIENT_OBJECTS =  \
+       $(OBJS)\ipcclient_sample_rc.o \
+       $(OBJS)\ipcclient_client.o
+IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+IPCSERVER_OBJECTS =  \
+       $(OBJS)\ipcserver_sample_rc.o \
+       $(OBJS)\ipcserver_server.o
+BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCCLIENT_OBJECTS =  \
+       $(OBJS)\baseipcclient_baseclient.o
+BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCSERVER_OBJECTS =  \
+       $(OBJS)\baseipcserver_baseserver.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_GUI),1)
+__ipcclient___depname = $(OBJS)\ipcclient.exe
+endif
+ifeq ($(USE_GUI),1)
+__ipcserver___depname = $(OBJS)\ipcserver.exe
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_0 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_0 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe
+       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe
+       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe
+       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample_rc.o
+       $(CXX) -o $@ $(IPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o
+       $(CXX) -o $@ $(IPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
+       $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
+       $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\ipcclient_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\ipcclient_client.o: ./client.cpp
+       $(CXX) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ipcserver_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\ipcserver_server.o: ./server.cpp
+       $(CXX) -c -o $@ $(IPCSERVER_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\baseipcclient_baseclient.o: ./baseclient.cpp
+       $(CXX) -c -o $@ $(BASEIPCCLIENT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\baseipcserver_baseserver.o: ./baseserver.cpp
+       $(CXX) -c -o $@ $(BASEIPCSERVER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx
index 7e2cdf8aec6cfac38b563ebee4041f1232306d5b..200a623026c2a73142c24a35ad958cd1c43c7106 100644 (file)
--- a/samples/ipc/makefile.unx
+++ b/samples/ipc/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc
index b06c578544e329ba476a093dc36b05d1f8f987c5..5ff2ccc062188d750467eb020b8a1cf7a817b439 100644 (file)
--- a/samples/ipc/makefile.vc
+++ b/samples/ipc/makefile.vc
@@ -1,410 +1,472 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-IPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\ipcclient_sample.res \\r
-       $(OBJS)\ipcclient_client.obj\r
-IPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-IPCSERVER_OBJECTS =  \\r
-       $(OBJS)\ipcserver_sample.res \\r
-       $(OBJS)\ipcserver_server.obj\r
-BASEIPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-BASEIPCCLIENT_OBJECTS =  \\r
-       $(OBJS)\baseipcclient_baseclient.obj\r
-BASEIPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-BASEIPCSERVER_OBJECTS =  \\r
-       $(OBJS)\baseipcserver_baseserver.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__ipcclient___depname = $(OBJS)\ipcclient.exe\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__ipcserver___depname = $(OBJS)\ipcserver.exe\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_22 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_36 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_36 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_50 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_50 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_0 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_0 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_0 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_0 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_0 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_0 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_0 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_0 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_3 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_3 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_3 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_3 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = T\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe\r
-       -if exist $(OBJS)\ipcclient.ilk del $(OBJS)\ipcclient.ilk\r
-       -if exist $(OBJS)\ipcclient.pdb del $(OBJS)\ipcclient.pdb\r
-       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe\r
-       -if exist $(OBJS)\ipcserver.ilk del $(OBJS)\ipcserver.ilk\r
-       -if exist $(OBJS)\ipcserver.pdb del $(OBJS)\ipcserver.pdb\r
-       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe\r
-       -if exist $(OBJS)\baseipcclient.ilk del $(OBJS)\baseipcclient.ilk\r
-       -if exist $(OBJS)\baseipcclient.pdb del $(OBJS)\baseipcclient.pdb\r
-       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe\r
-       -if exist $(OBJS)\baseipcserver.ilk del $(OBJS)\baseipcserver.ilk\r
-       -if exist $(OBJS)\baseipcserver.pdb del $(OBJS)\baseipcserver.pdb\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(IPCCLIENT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(IPCSERVER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(BASEIPCCLIENT_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(BASEIPCSERVER_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\ipcclient_client.obj: .\client.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp\r
-\r
-$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\ipcserver_server.obj: .\server.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IPCSERVER_CXXFLAGS) .\server.cpp\r
-\r
-$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp\r
-\r
-$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+IPCCLIENT_OBJECTS =  \
+       $(OBJS)\ipcclient_client.obj
+IPCCLIENT_RESOURCES =  \
+       $(OBJS)\ipcclient_sample.res
+IPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(__DEBUGINFO_18) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+IPCSERVER_OBJECTS =  \
+       $(OBJS)\ipcserver_server.obj
+IPCSERVER_RESOURCES =  \
+       $(OBJS)\ipcserver_sample.res
+BASEIPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(__DEBUGINFO_34) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCCLIENT_OBJECTS =  \
+       $(OBJS)\baseipcclient_baseclient.obj
+BASEIPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(__DEBUGINFO_50) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCSERVER_OBJECTS =  \
+       $(OBJS)\baseipcserver_baseserver.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_GUI)" == "1"
+__ipcclient___depname = $(OBJS)\ipcclient.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(USE_GUI)" == "1"
+__ipcserver___depname = $(OBJS)\ipcserver.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_18 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_26 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_26 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_34 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_34 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_42 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_42 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_50 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_50 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_50 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_50 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_58 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_58 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_0 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_0 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_0 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_0 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_0 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_0 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_0 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_0 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_2 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe
+       -if exist $(OBJS)\ipcclient.ilk del $(OBJS)\ipcclient.ilk
+       -if exist $(OBJS)\ipcclient.pdb del $(OBJS)\ipcclient.pdb
+       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe
+       -if exist $(OBJS)\ipcserver.ilk del $(OBJS)\ipcserver.ilk
+       -if exist $(OBJS)\ipcserver.pdb del $(OBJS)\ipcserver.pdb
+       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe
+       -if exist $(OBJS)\baseipcclient.ilk del $(OBJS)\baseipcclient.ilk
+       -if exist $(OBJS)\baseipcclient.pdb del $(OBJS)\baseipcclient.pdb
+       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe
+       -if exist $(OBJS)\baseipcserver.ilk del $(OBJS)\baseipcserver.ilk
+       -if exist $(OBJS)\baseipcserver.pdb del $(OBJS)\baseipcserver.pdb
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(IPCCLIENT_OBJECTS) $(IPCCLIENT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(IPCSERVER_OBJECTS) $(IPCSERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(BASEIPCCLIENT_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(BASEIPCSERVER_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\ipcclient_client.obj: .\client.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp
+
+$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\ipcserver_server.obj: .\server.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IPCSERVER_CXXFLAGS) .\server.cpp
+
+$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp
+
+$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp
+

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index 419bce81269023f78a1cd995faa29a1133bc9d9d..a6cb0d5630401bc916f089e7ebf6e6fffa1df9f6 100644 (file)
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -1,353 +1,353 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__ipcclient___depname =\r
-!ifeq USE_GUI 1\r
-__ipcclient___depname = $(OBJS)\ipcclient.exe\r
-!endif\r
-__ipcserver___depname =\r
-!ifeq USE_GUI 1\r
-__ipcserver___depname = $(OBJS)\ipcserver.exe\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__DEBUGINFO =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO = -d2\r
-!endif\r
-__DEBUGINFO_3 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_3 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_3 = debug all\r
-!endif\r
-__OPTIMIZEFLAG =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG = -ot -ox\r
-!endif\r
-__THREADSFLAG =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG = -bm\r
-!endif\r
-__RUNTIME_LIBS =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS = \r
-!endif\r
-__RTTIFLAG =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG = -xr\r
-!endif\r
-__EXCEPTIONSFLAG =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-IPCCLIENT_OBJECTS =  &\r
-       $(OBJS)\ipcclient_client.obj\r
-IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-IPCSERVER_OBJECTS =  &\r
-       $(OBJS)\ipcserver_server.obj\r
-BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCCLIENT_OBJECTS =  &\r
-       $(OBJS)\baseipcclient_baseclient.obj\r
-BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-BASEIPCSERVER_OBJECTS =  &\r
-       $(OBJS)\baseipcserver_baseserver.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe\r
-       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe\r
-       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe\r
-       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe\r
-\r
-!ifeq USE_GUI 1\r
-$(OBJS)\ipcclient.exe :  $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res\r
-       @%create $(OBJS)\ipcclient.lbc\r
-       @%append $(OBJS)\ipcclient.lbc option quiet\r
-       @%append $(OBJS)\ipcclient.lbc name $^@\r
-       @%append $(OBJS)\ipcclient.lbc option caseexact\r
-       @%append $(OBJS)\ipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcclient.lbc library %i\r
-       @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res\r
-       @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i\r
-       wlink @$(OBJS)\ipcclient.lbc\r
-!endif\r
-\r
-!ifeq USE_GUI 1\r
-$(OBJS)\ipcserver.exe :  $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res\r
-       @%create $(OBJS)\ipcserver.lbc\r
-       @%append $(OBJS)\ipcserver.lbc option quiet\r
-       @%append $(OBJS)\ipcserver.lbc name $^@\r
-       @%append $(OBJS)\ipcserver.lbc option caseexact\r
-       @%append $(OBJS)\ipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcserver.lbc library %i\r
-       @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res\r
-       @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i\r
-       wlink @$(OBJS)\ipcserver.lbc\r
-!endif\r
-\r
-$(OBJS)\baseipcclient.exe :  $(BASEIPCCLIENT_OBJECTS)\r
-       @%create $(OBJS)\baseipcclient.lbc\r
-       @%append $(OBJS)\baseipcclient.lbc option quiet\r
-       @%append $(OBJS)\baseipcclient.lbc name $^@\r
-       @%append $(OBJS)\baseipcclient.lbc option caseexact\r
-       @%append $(OBJS)\baseipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcclient.lbc library %i\r
-       @%append $(OBJS)\baseipcclient.lbc\r
-       @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i\r
-       wlink @$(OBJS)\baseipcclient.lbc\r
-\r
-$(OBJS)\baseipcserver.exe :  $(BASEIPCSERVER_OBJECTS)\r
-       @%create $(OBJS)\baseipcserver.lbc\r
-       @%append $(OBJS)\baseipcserver.lbc option quiet\r
-       @%append $(OBJS)\baseipcserver.lbc name $^@\r
-       @%append $(OBJS)\baseipcserver.lbc option caseexact\r
-       @%append $(OBJS)\baseipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcserver.lbc library %i\r
-       @%append $(OBJS)\baseipcserver.lbc\r
-       @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i\r
-       wlink @$(OBJS)\baseipcserver.lbc\r
-\r
-$(OBJS)\ipcclient_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\ipcclient_client.obj :  .AUTODEPEND .\client.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $<\r
-\r
-$(OBJS)\ipcserver_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\ipcserver_server.obj :  .AUTODEPEND .\server.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $<\r
-\r
-$(OBJS)\baseipcclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCCLIENT_CXXFLAGS) $<\r
-\r
-$(OBJS)\baseipcserver_baseserver.obj :  .AUTODEPEND .\baseserver.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCSERVER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__ipcclient___depname =
+!ifeq USE_GUI 1
+__ipcclient___depname = $(OBJS)\ipcclient.exe
+!endif
+__ipcserver___depname =
+!ifeq USE_GUI 1
+__ipcserver___depname = $(OBJS)\ipcserver.exe
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__DEBUGINFO =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_3 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_3 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_3 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_3 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_3 = debug all
+!endif
+__OPTIMIZEFLAG =
+!ifeq BUILD debug
+__OPTIMIZEFLAG = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG = -ot -ox
+!endif
+__THREADSFLAG =
+!ifeq USE_THREADS 0
+__THREADSFLAG = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG = -bm
+!endif
+__RUNTIME_LIBS =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS = 
+!endif
+__RTTIFLAG =
+!ifeq USE_RTTI 0
+__RTTIFLAG = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG = -xr
+!endif
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+IPCCLIENT_OBJECTS =  &
+       $(OBJS)\ipcclient_client.obj
+IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+IPCSERVER_OBJECTS =  &
+       $(OBJS)\ipcserver_server.obj
+BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCCLIENT_OBJECTS =  &
+       $(OBJS)\baseipcclient_baseclient.obj
+BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCSERVER_OBJECTS =  &
+       $(OBJS)\baseipcserver_baseserver.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe
+       -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe
+       -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe
+       -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe
+
+!ifeq USE_GUI 1
+$(OBJS)\ipcclient.exe :  $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
+       @%create $(OBJS)\ipcclient.lbc
+       @%append $(OBJS)\ipcclient.lbc option quiet
+       @%append $(OBJS)\ipcclient.lbc name $^@
+       @%append $(OBJS)\ipcclient.lbc option caseexact
+       @%append $(OBJS)\ipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcclient.lbc library %i
+       @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res
+       @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i
+       wlink @$(OBJS)\ipcclient.lbc
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\ipcserver.exe :  $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
+       @%create $(OBJS)\ipcserver.lbc
+       @%append $(OBJS)\ipcserver.lbc option quiet
+       @%append $(OBJS)\ipcserver.lbc name $^@
+       @%append $(OBJS)\ipcserver.lbc option caseexact
+       @%append $(OBJS)\ipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcserver.lbc library %i
+       @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res
+       @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i
+       wlink @$(OBJS)\ipcserver.lbc
+!endif
+
+$(OBJS)\baseipcclient.exe :  $(BASEIPCCLIENT_OBJECTS)
+       @%create $(OBJS)\baseipcclient.lbc
+       @%append $(OBJS)\baseipcclient.lbc option quiet
+       @%append $(OBJS)\baseipcclient.lbc name $^@
+       @%append $(OBJS)\baseipcclient.lbc option caseexact
+       @%append $(OBJS)\baseipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcclient.lbc library %i
+       @%append $(OBJS)\baseipcclient.lbc
+       @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i
+       wlink @$(OBJS)\baseipcclient.lbc
+
+$(OBJS)\baseipcserver.exe :  $(BASEIPCSERVER_OBJECTS)
+       @%create $(OBJS)\baseipcserver.lbc
+       @%append $(OBJS)\baseipcserver.lbc option quiet
+       @%append $(OBJS)\baseipcserver.lbc name $^@
+       @%append $(OBJS)\baseipcserver.lbc option caseexact
+       @%append $(OBJS)\baseipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcserver.lbc library %i
+       @%append $(OBJS)\baseipcserver.lbc
+       @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i
+       wlink @$(OBJS)\baseipcserver.lbc
+
+$(OBJS)\ipcclient_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\ipcclient_client.obj :  .AUTODEPEND .\client.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $<
+
+$(OBJS)\ipcserver_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\ipcserver_server.obj :  .AUTODEPEND .\server.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $<
+
+$(OBJS)\baseipcclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCCLIENT_CXXFLAGS) $<
+
+$(OBJS)\baseipcserver_baseserver.obj :  .AUTODEPEND .\baseserver.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCSERVER_CXXFLAGS) $<
+

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index e812f1944bd0f8219545d23afb97d98e6d2591ba..49a81d8bf8fd5a2ecba086ec6924987e8291fea2 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/joytest/joytest.dsp b/samples/joytest/joytest.dsp
index 97b0fb9436385ca1f711af587fd6d69b5431bdde..71a83dd8685e2770382298bcc396d301d098a97b 100644 (file)
--- a/samples/joytest/joytest.dsp
+++ b/samples/joytest/joytest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\joytest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\joytest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\joytest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\joytest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj
index ddf0be2b3ec875980d08de1c18d2f9235e244daa..b79ed2dd76d2690dffad5cb916a5163eef93da13 100644 (file)
--- a/samples/joytest/joytest_vc7.vcproj
+++ b/samples/joytest/joytest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\joytest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\joytest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\joytest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\joytest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/joytest/joytest_vc8.vcproj b/samples/joytest/joytest_vc8.vcproj
index ebe79da5fdafc61c9afa3e157c2c397baacc16a7..1980bd67897caffdbc8e3f4f42f340594b34478d 100644 (file)
--- a/samples/joytest/joytest_vc8.vcproj
+++ b/samples/joytest/joytest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/joytest/joytest_vc9.vcproj b/samples/joytest/joytest_vc9.vcproj
index 7d5120bdd308f73efc34f40795bac7cc1484356b..da8bad7cf744f62f47b8f976c9d08641467fcfac 100644 (file)
--- a/samples/joytest/joytest_vc9.vcproj
+++ b/samples/joytest/joytest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\joytest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\joytest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc
index 60a96b76451076e8f23f94da8c974313cb3deb75..af69ed056dbed2685da0ad49646a68990a005991 100644 (file)
--- a/samples/joytest/makefile.bcc
+++ b/samples/joytest/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-JOYTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-JOYTEST_OBJECTS =  \\r
-       $(OBJS)\joytest_joytest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\joytest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe\r
-       -if exist $(OBJS)\joytest.tds del $(OBJS)\joytest.tds\r
-       -if exist $(OBJS)\joytest.ilc del $(OBJS)\joytest.ilc\r
-       -if exist $(OBJS)\joytest.ild del $(OBJS)\joytest.ild\r
-       -if exist $(OBJS)\joytest.ilf del $(OBJS)\joytest.ilf\r
-       -if exist $(OBJS)\joytest.ils del $(OBJS)\joytest.ils\r
-\r
-$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS)  $(OBJS)\joytest_joytest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(JOYTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\joytest_joytest.res\r
-|\r
-\r
-$(OBJS)\joytest_joytest.obj: .\joytest.cpp\r
-       $(CXX) -q -c -P -o$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp\r
-\r
-$(OBJS)\joytest_joytest.res: .\joytest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\joytest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+JOYTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+JOYTEST_OBJECTS =  \
+       $(OBJS)\joytest_joytest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\joytest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
+       -if exist $(OBJS)\joytest.tds del $(OBJS)\joytest.tds
+       -if exist $(OBJS)\joytest.ilc del $(OBJS)\joytest.ilc
+       -if exist $(OBJS)\joytest.ild del $(OBJS)\joytest.ild
+       -if exist $(OBJS)\joytest.ilf del $(OBJS)\joytest.ilf
+       -if exist $(OBJS)\joytest.ils del $(OBJS)\joytest.ils
+
+$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS)  $(OBJS)\joytest_joytest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(JOYTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\joytest_joytest.res
+|
+
+$(OBJS)\joytest_joytest.obj: .\joytest.cpp
+       $(CXX) -q -c -P -o$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp
+
+$(OBJS)\joytest_joytest.res: .\joytest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\joytest.rc
+

diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc
index c5197ff6adb73212b9c47d581adfdd6a987143ed..4f2cac26efc6c90e3b6b4e121e4ab941f5ede4cc 100644 (file)
--- a/samples/joytest/makefile.gcc
+++ b/samples/joytest/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-JOYTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-JOYTEST_OBJECTS =  \\r
-       $(OBJS)\joytest_joytest.o \\r
-       $(OBJS)\joytest_joytest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\joytest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe\r
-\r
-$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest_rc.o\r
-       $(CXX) -o $@ $(JOYTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\joytest_joytest.o: ./joytest.cpp\r
-       $(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\joytest_joytest_rc.o: ./joytest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+JOYTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+JOYTEST_OBJECTS =  \
+       $(OBJS)\joytest_joytest.o \
+       $(OBJS)\joytest_joytest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\joytest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
+
+$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest_rc.o
+       $(CXX) -o $@ $(JOYTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\joytest_joytest.o: ./joytest.cpp
+       $(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\joytest_joytest_rc.o: ./joytest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx
index e8a781ddd10d20365f4f90076032d1863f30acb3..858adda8d311c0b854d20f4ba75173151da2e139 100644 (file)
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index ec429f063c7be699cf3f2a2c073f8ef8ab69b672..1c683d69a2ba9a34b9b3bea0743eb6d586248760 100644 (file)
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-JOYTEST_OBJECTS =  \\r
-       $(OBJS)\joytest_joytest.obj \\r
-       $(OBJS)\joytest_joytest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\joytest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe\r
-       -if exist $(OBJS)\joytest.ilk del $(OBJS)\joytest.ilk\r
-       -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb\r
-\r
-$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(JOYTEST_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\joytest_joytest.obj: .\joytest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp\r
-\r
-$(OBJS)\joytest_joytest.res: .\joytest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\joytest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+JOYTEST_OBJECTS =  \
+       $(OBJS)\joytest_joytest.obj
+JOYTEST_RESOURCES =  \
+       $(OBJS)\joytest_joytest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\joytest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
+       -if exist $(OBJS)\joytest.ilk del $(OBJS)\joytest.ilk
+       -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb
+
+$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(JOYTEST_OBJECTS) $(JOYTEST_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\joytest_joytest.obj: .\joytest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp
+
+$(OBJS)\joytest_joytest.res: .\joytest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\joytest.rc
+

diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat
index b7a3320d032dcea34530c69135184785640d685a..7b2dd442092d44e0fd71737464d04b50b9546b10 100644 (file)
--- a/samples/joytest/makefile.wat
+++ b/samples/joytest/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-JOYTEST_OBJECTS =  &\r
-       $(OBJS)\joytest_joytest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\joytest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe\r
-\r
-$(OBJS)\joytest.exe :  $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res\r
-       @%create $(OBJS)\joytest.lbc\r
-       @%append $(OBJS)\joytest.lbc option quiet\r
-       @%append $(OBJS)\joytest.lbc name $^@\r
-       @%append $(OBJS)\joytest.lbc option caseexact\r
-       @%append $(OBJS)\joytest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\joytest.lbc library %i\r
-       @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res\r
-       @for %i in () do @%append $(OBJS)\joytest.lbc option stack=%i\r
-       wlink @$(OBJS)\joytest.lbc\r
-\r
-$(OBJS)\joytest_joytest.obj :  .AUTODEPEND .\joytest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\joytest_joytest.res :  .AUTODEPEND .\joytest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+JOYTEST_OBJECTS =  &
+       $(OBJS)\joytest_joytest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\joytest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
+
+$(OBJS)\joytest.exe :  $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res
+       @%create $(OBJS)\joytest.lbc
+       @%append $(OBJS)\joytest.lbc option quiet
+       @%append $(OBJS)\joytest.lbc name $^@
+       @%append $(OBJS)\joytest.lbc option caseexact
+       @%append $(OBJS)\joytest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\joytest.lbc library %i
+       @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res
+       @for %i in () do @%append $(OBJS)\joytest.lbc option stack=%i
+       wlink @$(OBJS)\joytest.lbc
+
+$(OBJS)\joytest_joytest.obj :  .AUTODEPEND .\joytest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $<
+
+$(OBJS)\joytest_joytest.res :  .AUTODEPEND .\joytest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 87ffd72c8078190b29cb1cad690a25f8eb615727..96ed5ac69ac1e832aac0f732894bb1455ad0e9bd 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/keyboard/keyboard.dsp b/samples/keyboard/keyboard.dsp
index ddc2ef3fa764326402123a0b2c77617e1530db8a..720e1b8b2c6035ebdecde0e045314b4ac7ec0ecb 100644 (file)
--- a/samples/keyboard/keyboard.dsp
+++ b/samples/keyboard/keyboard.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\keyboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\keyboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\keyboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\keyboard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj
index fa792c7d20880426cf0d4dc03e2cde5273aa93f1..708b198c7a64ce3854d1fce7dfe1a30e41d6f0ed 100644 (file)
--- a/samples/keyboard/keyboard_vc7.vcproj
+++ b/samples/keyboard/keyboard_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\keyboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\keyboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\keyboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj
index 7d7683178d24a9bb7ca3828e32594c3643c3f2ad..5e3baf163990ec6b09e36f44130602fd668e2c36 100644 (file)
--- a/samples/keyboard/keyboard_vc8.vcproj
+++ b/samples/keyboard/keyboard_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/keyboard/keyboard_vc9.vcproj b/samples/keyboard/keyboard_vc9.vcproj
index b01fe5d94a65e7efb3d04a166cc079812891c568..a2d65a156d0d2b5d8c2fc652777482b10f2d4b9c 100644 (file)
--- a/samples/keyboard/keyboard_vc9.vcproj
+++ b/samples/keyboard/keyboard_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\keyboard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index a9f1376303a4a3ca84f4f557d25cfb1518a0bac8..8f2648fdd107f687027f078ee0f23642a870d644 100644 (file)
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-KEYBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-KEYBOARD_OBJECTS =  \\r
-       $(OBJS)\keyboard_keyboard.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\keyboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
-       -if exist $(OBJS)\keyboard.tds del $(OBJS)\keyboard.tds\r
-       -if exist $(OBJS)\keyboard.ilc del $(OBJS)\keyboard.ilc\r
-       -if exist $(OBJS)\keyboard.ild del $(OBJS)\keyboard.ild\r
-       -if exist $(OBJS)\keyboard.ilf del $(OBJS)\keyboard.ilf\r
-       -if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils\r
-\r
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_keyboard.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_keyboard.res\r
-|\r
-\r
-$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp\r
-       $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
-\r
-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\keyboard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+KEYBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+KEYBOARD_OBJECTS =  \
+       $(OBJS)\keyboard_keyboard.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\keyboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
+       -if exist $(OBJS)\keyboard.tds del $(OBJS)\keyboard.tds
+       -if exist $(OBJS)\keyboard.ilc del $(OBJS)\keyboard.ilc
+       -if exist $(OBJS)\keyboard.ild del $(OBJS)\keyboard.ild
+       -if exist $(OBJS)\keyboard.ilf del $(OBJS)\keyboard.ilf
+       -if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils
+
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_keyboard.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_keyboard.res
+|
+
+$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp
+       $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp
+
+$(OBJS)\keyboard_keyboard.res: .\keyboard.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\keyboard.rc
+

diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index 78f65f98ee3de30a1175ecb31a600281b8c9295b..0afd17861119799ac7b15a3f69daaf203a90ab9c 100644 (file)
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-KEYBOARD_OBJECTS =  \\r
-       $(OBJS)\keyboard_keyboard.o \\r
-       $(OBJS)\keyboard_keyboard_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\keyboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
-\r
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o\r
-       $(CXX) -o $@ $(KEYBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\keyboard_keyboard.o: ./keyboard.cpp\r
-       $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\keyboard_keyboard_rc.o: ./keyboard.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+KEYBOARD_OBJECTS =  \
+       $(OBJS)\keyboard_keyboard.o \
+       $(OBJS)\keyboard_keyboard_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\keyboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
+
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o
+       $(CXX) -o $@ $(KEYBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\keyboard_keyboard.o: ./keyboard.cpp
+       $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\keyboard_keyboard_rc.o: ./keyboard.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx
index a9cf253d9ed86b7cb33c0737fb58747f02ebdf2f..8faf3e044d8ed3dd65338fefafa87c00f852ac2a 100644 (file)
--- a/samples/keyboard/makefile.unx
+++ b/samples/keyboard/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 9661c0672ffb279c75ab4ac0e2a340190b751c15..b0edc4414e409e03df2b89d25cedf3f270c2ac5a 100644 (file)
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-KEYBOARD_OBJECTS =  \\r
-       $(OBJS)\keyboard_keyboard.obj \\r
-       $(OBJS)\keyboard_keyboard.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\keyboard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
-       -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk\r
-       -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb\r
-\r
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(KEYBOARD_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
-\r
-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\keyboard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+KEYBOARD_OBJECTS =  \
+       $(OBJS)\keyboard_keyboard.obj
+KEYBOARD_RESOURCES =  \
+       $(OBJS)\keyboard_keyboard.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\keyboard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
+       -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk
+       -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb
+
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(KEYBOARD_OBJECTS) $(KEYBOARD_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp
+
+$(OBJS)\keyboard_keyboard.res: .\keyboard.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\keyboard.rc
+

diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index fcf3956e4de9a1eae80cf3876fed8a403f660350..c210cc601b612d3608b0e92eae471bc56d00bcc4 100644 (file)
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-KEYBOARD_OBJECTS =  &\r
-       $(OBJS)\keyboard_keyboard.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\keyboard.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
-\r
-$(OBJS)\keyboard.exe :  $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res\r
-       @%create $(OBJS)\keyboard.lbc\r
-       @%append $(OBJS)\keyboard.lbc option quiet\r
-       @%append $(OBJS)\keyboard.lbc name $^@\r
-       @%append $(OBJS)\keyboard.lbc option caseexact\r
-       @%append $(OBJS)\keyboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\keyboard.lbc library %i\r
-       @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res\r
-       @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i\r
-       wlink @$(OBJS)\keyboard.lbc\r
-\r
-$(OBJS)\keyboard_keyboard.obj :  .AUTODEPEND .\keyboard.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<\r
-\r
-$(OBJS)\keyboard_keyboard.res :  .AUTODEPEND .\keyboard.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+KEYBOARD_OBJECTS =  &
+       $(OBJS)\keyboard_keyboard.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\keyboard.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
+
+$(OBJS)\keyboard.exe :  $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
+       @%create $(OBJS)\keyboard.lbc
+       @%append $(OBJS)\keyboard.lbc option quiet
+       @%append $(OBJS)\keyboard.lbc name $^@
+       @%append $(OBJS)\keyboard.lbc option caseexact
+       @%append $(OBJS)\keyboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\keyboard.lbc library %i
+       @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res
+       @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i
+       wlink @$(OBJS)\keyboard.lbc
+
+$(OBJS)\keyboard_keyboard.obj :  .AUTODEPEND .\keyboard.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<
+
+$(OBJS)\keyboard_keyboard.res :  .AUTODEPEND .\keyboard.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index cb05ad3040fae1e2c333e23369439ed6cc5ec603..696b9ef2fab36e6a45f1634703f91fca0178ada8 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp
index b085cd750ab418336c6b2cb9ab3bc15e62b756bd..16be621cf41775c8d998f60f40d26a4c4f3f9e9f 100644 (file)
--- a/samples/layout/layout.dsp
+++ b/samples/layout/layout.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\layout"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\layout"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\layout"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\layout"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj
index 335195173cda96df00ccb8b119b638d16113a7a4..b8635c3a1cfaffe049022ec8e2a90eb5a2c672f2 100644 (file)
--- a/samples/layout/layout_vc7.vcproj
+++ b/samples/layout/layout_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\layout.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\layout.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\layout.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\layout.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index 1676722f56fd2d0b1f97485c01bada189a767209..2734c63c094323438152458eedd6fcaeb1918a70 100644 (file)
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj
index 9b1a56a4eedc9ef3c7fda9a340e7d00765595e6b..4ad11bbf6e8fba928bc7f7a5038564787e9d4ba6 100644 (file)
--- a/samples/layout/layout_vc9.vcproj
+++ b/samples/layout/layout_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\layout.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\layout.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index d062d6983748d8402f18423c22a3731c06a5bb54..d2f34042be2cc78b5baf32f927d39280b0b532ad 100644 (file)
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LAYOUT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-LAYOUT_OBJECTS =  \\r
-       $(OBJS)\layout_layout.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\layout.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
-       -if exist $(OBJS)\layout.tds del $(OBJS)\layout.tds\r
-       -if exist $(OBJS)\layout.ilc del $(OBJS)\layout.ilc\r
-       -if exist $(OBJS)\layout.ild del $(OBJS)\layout.ild\r
-       -if exist $(OBJS)\layout.ilf del $(OBJS)\layout.ilf\r
-       -if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils\r
-\r
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS)  $(OBJS)\layout_layout.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_layout.res\r
-|\r
-\r
-$(OBJS)\layout_layout.obj: .\layout.cpp\r
-       $(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
-\r
-$(OBJS)\layout_layout.res: .\layout.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\layout.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LAYOUT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+LAYOUT_OBJECTS =  \
+       $(OBJS)\layout_layout.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\layout.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
+       -if exist $(OBJS)\layout.tds del $(OBJS)\layout.tds
+       -if exist $(OBJS)\layout.ilc del $(OBJS)\layout.ilc
+       -if exist $(OBJS)\layout.ild del $(OBJS)\layout.ild
+       -if exist $(OBJS)\layout.ilf del $(OBJS)\layout.ilf
+       -if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils
+
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS)  $(OBJS)\layout_layout.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_layout.res
+|
+
+$(OBJS)\layout_layout.obj: .\layout.cpp
+       $(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) .\layout.cpp
+
+$(OBJS)\layout_layout.res: .\layout.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\layout.rc
+

diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 6afa33470ebdb969c8ef9a3a5766a8f5535df4e0..7d5edd109e7d3038280f832f2b5a7409ab1cc55d 100644 (file)
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LAYOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-LAYOUT_OBJECTS =  \\r
-       $(OBJS)\layout_layout.o \\r
-       $(OBJS)\layout_layout_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\layout.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
-\r
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o\r
-       $(CXX) -o $@ $(LAYOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\layout_layout.o: ./layout.cpp\r
-       $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\layout_layout_rc.o: ./layout.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LAYOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+LAYOUT_OBJECTS =  \
+       $(OBJS)\layout_layout.o \
+       $(OBJS)\layout_layout_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\layout.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
+
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o
+       $(CXX) -o $@ $(LAYOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\layout_layout.o: ./layout.cpp
+       $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\layout_layout_rc.o: ./layout.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
index 8b16e43d5899f6b39c462e86f574e637d5dee826..35e95632e451c10301600231dde24489f5594358 100644 (file)
--- a/samples/layout/makefile.unx
+++ b/samples/layout/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index 153e2558417a5611cd15a7caf65d19786dc0a32f..3460cd3b03d685c9a8d70fcf6f8c481bb3d5ce24 100644 (file)
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-LAYOUT_OBJECTS =  \\r
-       $(OBJS)\layout_layout.obj \\r
-       $(OBJS)\layout_layout.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\layout.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
-       -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk\r
-       -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb\r
-\r
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(LAYOUT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\layout_layout.obj: .\layout.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
-\r
-$(OBJS)\layout_layout.res: .\layout.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\layout.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+LAYOUT_OBJECTS =  \
+       $(OBJS)\layout_layout.obj
+LAYOUT_RESOURCES =  \
+       $(OBJS)\layout_layout.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\layout.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
+       -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk
+       -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb
+
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(LAYOUT_OBJECTS) $(LAYOUT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\layout_layout.obj: .\layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp
+
+$(OBJS)\layout_layout.res: .\layout.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\layout.rc
+

diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index 95552911fc34988e5b81261ab4a1e6bd79b96c48..058af4a5433bc888e2c8e6c582324175088b1e95 100644 (file)
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-LAYOUT_OBJECTS =  &\r
-       $(OBJS)\layout_layout.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\layout.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
-\r
-$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res\r
-       @%create $(OBJS)\layout.lbc\r
-       @%append $(OBJS)\layout.lbc option quiet\r
-       @%append $(OBJS)\layout.lbc name $^@\r
-       @%append $(OBJS)\layout.lbc option caseexact\r
-       @%append $(OBJS)\layout.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\layout.lbc library %i\r
-       @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res\r
-       @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i\r
-       wlink @$(OBJS)\layout.lbc\r
-\r
-$(OBJS)\layout_layout.obj :  .AUTODEPEND .\layout.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<\r
-\r
-$(OBJS)\layout_layout.res :  .AUTODEPEND .\layout.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+LAYOUT_OBJECTS =  &
+       $(OBJS)\layout_layout.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\layout.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
+
+$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+       @%create $(OBJS)\layout.lbc
+       @%append $(OBJS)\layout.lbc option quiet
+       @%append $(OBJS)\layout.lbc name $^@
+       @%append $(OBJS)\layout.lbc option caseexact
+       @%append $(OBJS)\layout.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\layout.lbc library %i
+       @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res
+       @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i
+       wlink @$(OBJS)\layout.lbc
+
+$(OBJS)\layout_layout.obj :  .AUTODEPEND .\layout.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<
+
+$(OBJS)\layout_layout.res :  .AUTODEPEND .\layout.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index acfb2d7b6994a901141cb5765979ff12a267654b..a94f78bab22510f6047eec56ffbe5d69702e4a1a 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/listctrl/listctrl.dsp b/samples/listctrl/listctrl.dsp
index 2249db61cde251de78213719787366104684ab9d..62ea22268123d76455bb2e174150fbcf3d4aed17 100644 (file)
--- a/samples/listctrl/listctrl.dsp
+++ b/samples/listctrl/listctrl.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\listctrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\listctrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\listctrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\listctrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj
index 9aa4a7d69f508f91ddc18e3e6dd1c5769ed37d86..593ef2576479ae5ee076f2bf98b7445528d9af04 100644 (file)
--- a/samples/listctrl/listctrl_vc7.vcproj
+++ b/samples/listctrl/listctrl_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\listctrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\listctrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\listctrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/listctrl/listctrl_vc8.vcproj b/samples/listctrl/listctrl_vc8.vcproj
index 6295323f5815bc2cae22f4eee517152003106094..ccb7ca8f6d68ba1c9d5e8bf5fcc258f667908311 100644 (file)
--- a/samples/listctrl/listctrl_vc8.vcproj
+++ b/samples/listctrl/listctrl_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/listctrl/listctrl_vc9.vcproj b/samples/listctrl/listctrl_vc9.vcproj
index cf867baef11751c19ea23b47487131f250d5e0ea..188c7f13fbdb9ab0b580563a3da92763e781547a 100644 (file)
--- a/samples/listctrl/listctrl_vc9.vcproj
+++ b/samples/listctrl/listctrl_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\listctrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc
index c9d10116883b1a3f52f70585df4b3df12355f7f4..ac29b189e1fcf48041f8c8848d106281154590a8 100644 (file)
--- a/samples/listctrl/makefile.bcc
+++ b/samples/listctrl/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LISTCTRL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-LISTCTRL_OBJECTS =  \\r
-       $(OBJS)\listctrl_listtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\listctrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe\r
-       -if exist $(OBJS)\listctrl.tds del $(OBJS)\listctrl.tds\r
-       -if exist $(OBJS)\listctrl.ilc del $(OBJS)\listctrl.ilc\r
-       -if exist $(OBJS)\listctrl.ild del $(OBJS)\listctrl.ild\r
-       -if exist $(OBJS)\listctrl.ilf del $(OBJS)\listctrl.ilf\r
-       -if exist $(OBJS)\listctrl.ils del $(OBJS)\listctrl.ils\r
-\r
-$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS)  $(OBJS)\listctrl_listtest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(LISTCTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\listctrl_listtest.res\r
-|\r
-\r
-$(OBJS)\listctrl_listtest.obj: .\listtest.cpp\r
-       $(CXX) -q -c -P -o$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp\r
-\r
-$(OBJS)\listctrl_listtest.res: .\listtest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\listtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LISTCTRL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+LISTCTRL_OBJECTS =  \
+       $(OBJS)\listctrl_listtest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\listctrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
+       -if exist $(OBJS)\listctrl.tds del $(OBJS)\listctrl.tds
+       -if exist $(OBJS)\listctrl.ilc del $(OBJS)\listctrl.ilc
+       -if exist $(OBJS)\listctrl.ild del $(OBJS)\listctrl.ild
+       -if exist $(OBJS)\listctrl.ilf del $(OBJS)\listctrl.ilf
+       -if exist $(OBJS)\listctrl.ils del $(OBJS)\listctrl.ils
+
+$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS)  $(OBJS)\listctrl_listtest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(LISTCTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\listctrl_listtest.res
+|
+
+$(OBJS)\listctrl_listtest.obj: .\listtest.cpp
+       $(CXX) -q -c -P -o$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp
+
+$(OBJS)\listctrl_listtest.res: .\listtest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\listtest.rc
+

diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc
index 7938bd83897a0b9f6d34a9fb52cb79bf8509213c..154b4007bc4817df1d432637bc61e4d734a1bf6e 100644 (file)
--- a/samples/listctrl/makefile.gcc
+++ b/samples/listctrl/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LISTCTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-LISTCTRL_OBJECTS =  \\r
-       $(OBJS)\listctrl_listtest.o \\r
-       $(OBJS)\listctrl_listtest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\listctrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe\r
-\r
-$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest_rc.o\r
-       $(CXX) -o $@ $(LISTCTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\listctrl_listtest.o: ./listtest.cpp\r
-       $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\listctrl_listtest_rc.o: ./listtest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LISTCTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+LISTCTRL_OBJECTS =  \
+       $(OBJS)\listctrl_listtest.o \
+       $(OBJS)\listctrl_listtest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\listctrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
+
+$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest_rc.o
+       $(CXX) -o $@ $(LISTCTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\listctrl_listtest.o: ./listtest.cpp
+       $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\listctrl_listtest_rc.o: ./listtest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
index b618977f3fa1421513ab649dd63130a496fd4b16..656c0a8bd3963bc821f362b46af3aa8b614bea60 100644 (file)
--- a/samples/listctrl/makefile.unx
+++ b/samples/listctrl/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc
index b5e4140589d848706b92f9711609e7856b169b7f..f08f0e212e6679bfa306e2752c16d93ddc55698c 100644 (file)
--- a/samples/listctrl/makefile.vc
+++ b/samples/listctrl/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-LISTCTRL_OBJECTS =  \\r
-       $(OBJS)\listctrl_listtest.obj \\r
-       $(OBJS)\listctrl_listtest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\listctrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe\r
-       -if exist $(OBJS)\listctrl.ilk del $(OBJS)\listctrl.ilk\r
-       -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb\r
-\r
-$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(LISTCTRL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\listctrl_listtest.obj: .\listtest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp\r
-\r
-$(OBJS)\listctrl_listtest.res: .\listtest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\listtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+LISTCTRL_OBJECTS =  \
+       $(OBJS)\listctrl_listtest.obj
+LISTCTRL_RESOURCES =  \
+       $(OBJS)\listctrl_listtest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\listctrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
+       -if exist $(OBJS)\listctrl.ilk del $(OBJS)\listctrl.ilk
+       -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb
+
+$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(LISTCTRL_OBJECTS) $(LISTCTRL_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\listctrl_listtest.obj: .\listtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp
+
+$(OBJS)\listctrl_listtest.res: .\listtest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\listtest.rc
+

diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
index 7da8853140d1d56645b08b90aae5ee006db3b030..c1a198f2a3415137b3121c406795eb17719c97d9 100644 (file)
--- a/samples/listctrl/makefile.wat
+++ b/samples/listctrl/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-LISTCTRL_OBJECTS =  &\r
-       $(OBJS)\listctrl_listtest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\listctrl.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe\r
-\r
-$(OBJS)\listctrl.exe :  $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res\r
-       @%create $(OBJS)\listctrl.lbc\r
-       @%append $(OBJS)\listctrl.lbc option quiet\r
-       @%append $(OBJS)\listctrl.lbc name $^@\r
-       @%append $(OBJS)\listctrl.lbc option caseexact\r
-       @%append $(OBJS)\listctrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\listctrl.lbc library %i\r
-       @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res\r
-       @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i\r
-       wlink @$(OBJS)\listctrl.lbc\r
-\r
-$(OBJS)\listctrl_listtest.obj :  .AUTODEPEND .\listtest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $<\r
-\r
-$(OBJS)\listctrl_listtest.res :  .AUTODEPEND .\listtest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+LISTCTRL_OBJECTS =  &
+       $(OBJS)\listctrl_listtest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\listctrl.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
+
+$(OBJS)\listctrl.exe :  $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
+       @%create $(OBJS)\listctrl.lbc
+       @%append $(OBJS)\listctrl.lbc option quiet
+       @%append $(OBJS)\listctrl.lbc name $^@
+       @%append $(OBJS)\listctrl.lbc option caseexact
+       @%append $(OBJS)\listctrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\listctrl.lbc library %i
+       @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res
+       @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i
+       wlink @$(OBJS)\listctrl.lbc
+
+$(OBJS)\listctrl_listtest.obj :  .AUTODEPEND .\listtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $<
+
+$(OBJS)\listctrl_listtest.res :  .AUTODEPEND .\listtest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index d18e929461b5dbb14cc071c5160d6418a87035d6..3d7008f7991398f28d9d62212840d80bac271b9e 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -1,823 +1,823 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \\r
-       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \\r
-       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \\r
-       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \\r
-       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \\r
-       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \\r
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \\r
-       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \\r
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
-       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
-       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
-       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.csm del .\*.csm\r
-       @echo cd access >access.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>access.bat\r
-       call access.bat\r
-       @del access.bat\r
-       @echo cd animate >animate.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>animate.bat\r
-       call animate.bat\r
-       @del animate.bat\r
-       @echo cd artprov >artprov.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>artprov.bat\r
-       call artprov.bat\r
-       @del artprov.bat\r
-       @echo cd aui >aui.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>aui.bat\r
-       call aui.bat\r
-       @del aui.bat\r
-       @echo cd calendar >calendar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>calendar.bat\r
-       call calendar.bat\r
-       @del calendar.bat\r
-       @echo cd caret >caret.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>caret.bat\r
-       call caret.bat\r
-       @del caret.bat\r
-       @echo cd clipboard >clipboard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>clipboard.bat\r
-       call clipboard.bat\r
-       @del clipboard.bat\r
-       @echo cd collpane >collpane.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat\r
-       call collpane.bat\r
-       @del collpane.bat\r
-       @echo cd combo >combo.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat\r
-       call combo.bat\r
-       @del combo.bat\r
-       @echo cd config >config.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat\r
-       call config.bat\r
-       @del config.bat\r
-       @echo cd console >console.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat\r
-       call console.bat\r
-       @del console.bat\r
-       @echo cd controls >controls.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>controls.bat\r
-       call controls.bat\r
-       @del controls.bat\r
-       @echo cd dataview >dataview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat\r
-       call dataview.bat\r
-       @del dataview.bat\r
-       @echo cd dialogs >dialogs.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialogs.bat\r
-       call dialogs.bat\r
-       @del dialogs.bat\r
-       @echo cd dialup >dialup.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialup.bat\r
-       call dialup.bat\r
-       @del dialup.bat\r
-       @echo cd display >display.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>display.bat\r
-       call display.bat\r
-       @del display.bat\r
-       @echo cd dnd >dnd.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dnd.bat\r
-       call dnd.bat\r
-       @del dnd.bat\r
-       @echo cd docview >docview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docview.bat\r
-       call docview.bat\r
-       @del docview.bat\r
-       @echo cd dragimag >dragimag.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dragimag.bat\r
-       call dragimag.bat\r
-       @del dragimag.bat\r
-       @echo cd drawing >drawing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>drawing.bat\r
-       call drawing.bat\r
-       @del drawing.bat\r
-       @echo cd erase >erase.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>erase.bat\r
-       call erase.bat\r
-       @del erase.bat\r
-       @echo cd event >event.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>event.bat\r
-       call event.bat\r
-       @del event.bat\r
-       @echo cd except >except.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>except.bat\r
-       call except.bat\r
-       @del except.bat\r
-       @echo cd exec >exec.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat\r
-       call exec.bat\r
-       @del exec.bat\r
-       @echo cd font >font.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>font.bat\r
-       call font.bat\r
-       @del font.bat\r
-       @echo cd grid >grid.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>grid.bat\r
-       call grid.bat\r
-       @del grid.bat\r
-       @echo cd help >help.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat\r
-       call help.bat\r
-       @del help.bat\r
-       @echo cd htlbox >htlbox.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>htlbox.bat\r
-       call htlbox.bat\r
-       @del htlbox.bat\r
-       @echo cd html >html.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>html.bat\r
-       call html.bat\r
-       @del html.bat\r
-       @echo cd image >image.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>image.bat\r
-       call image.bat\r
-       @del image.bat\r
-       @echo cd internat >internat.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>internat.bat\r
-       call internat.bat\r
-       @del internat.bat\r
-       @echo cd ipc >ipc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ipc.bat\r
-       call ipc.bat\r
-       @del ipc.bat\r
-       @echo cd joytest >joytest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>joytest.bat\r
-       call joytest.bat\r
-       @del joytest.bat\r
-       @echo cd keyboard >keyboard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>keyboard.bat\r
-       call keyboard.bat\r
-       @del keyboard.bat\r
-       @echo cd layout >layout.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>layout.bat\r
-       call layout.bat\r
-       @del layout.bat\r
-       @echo cd listctrl >listctrl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>listctrl.bat\r
-       call listctrl.bat\r
-       @del listctrl.bat\r
-       @echo cd mdi >mdi.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mdi.bat\r
-       call mdi.bat\r
-       @del mdi.bat\r
-       @echo cd mediaplayer >mediaplayer.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat\r
-       call mediaplayer.bat\r
-       @del mediaplayer.bat\r
-       @echo cd menu >menu.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat\r
-       call menu.bat\r
-       @del menu.bat\r
-       @echo cd minimal >minimal.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minimal.bat\r
-       call minimal.bat\r
-       @del minimal.bat\r
-       @echo cd nativdlg >nativdlg.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>nativdlg.bat\r
-       call nativdlg.bat\r
-       @del nativdlg.bat\r
-       @echo cd notebook >notebook.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>notebook.bat\r
-       call notebook.bat\r
-       @del notebook.bat\r
-       @echo cd oleauto >oleauto.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>oleauto.bat\r
-       call oleauto.bat\r
-       @del oleauto.bat\r
-       @echo cd opengl >opengl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>opengl.bat\r
-       call opengl.bat\r
-       @del opengl.bat\r
-       @echo cd ownerdrw >ownerdrw.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ownerdrw.bat\r
-       call ownerdrw.bat\r
-       @del ownerdrw.bat\r
-       @echo cd popup >popup.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat\r
-       call popup.bat\r
-       @del popup.bat\r
-       @echo cd power >power.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat\r
-       call power.bat\r
-       @del power.bat\r
-       @echo cd printing >printing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat\r
-       call printing.bat\r
-       @del printing.bat\r
-       @echo cd propgrid >propgrid.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>propgrid.bat\r
-       call propgrid.bat\r
-       @del propgrid.bat\r
-       @echo cd regtest >regtest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>regtest.bat\r
-       call regtest.bat\r
-       @del regtest.bat\r
-       @echo cd render >render.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat\r
-       call render.bat\r
-       @del render.bat\r
-       @echo cd ribbon >ribbon.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ribbon.bat\r
-       call ribbon.bat\r
-       @del ribbon.bat\r
-       @echo cd richtext >richtext.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richtext.bat\r
-       call richtext.bat\r
-       @del richtext.bat\r
-       @echo cd sashtest >sashtest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sashtest.bat\r
-       call sashtest.bat\r
-       @del sashtest.bat\r
-       @echo cd scroll >scroll.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>scroll.bat\r
-       call scroll.bat\r
-       @del scroll.bat\r
-       @echo cd shaped >shaped.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>shaped.bat\r
-       call shaped.bat\r
-       @del shaped.bat\r
-       @echo cd sockets >sockets.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sockets.bat\r
-       call sockets.bat\r
-       @del sockets.bat\r
-       @echo cd sound >sound.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sound.bat\r
-       call sound.bat\r
-       @del sound.bat\r
-       @echo cd splash >splash.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splash.bat\r
-       call splash.bat\r
-       @del splash.bat\r
-       @echo cd splitter >splitter.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splitter.bat\r
-       call splitter.bat\r
-       @del splitter.bat\r
-       @echo cd statbar >statbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>statbar.bat\r
-       call statbar.bat\r
-       @del statbar.bat\r
-       @echo cd stc >stc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>stc.bat\r
-       call stc.bat\r
-       @del stc.bat\r
-       @echo cd svg >svg.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>svg.bat\r
-       call svg.bat\r
-       @del svg.bat\r
-       @echo cd taborder >taborder.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taborder.bat\r
-       call taborder.bat\r
-       @del taborder.bat\r
-       @echo cd taskbar >taskbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat\r
-       call taskbar.bat\r
-       @del taskbar.bat\r
-       @echo cd text >text.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>text.bat\r
-       call text.bat\r
-       @del text.bat\r
-       @echo cd thread >thread.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thread.bat\r
-       call thread.bat\r
-       @del thread.bat\r
-       @echo cd toolbar >toolbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>toolbar.bat\r
-       call toolbar.bat\r
-       @del toolbar.bat\r
-       @echo cd treectrl >treectrl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>treectrl.bat\r
-       call treectrl.bat\r
-       @del treectrl.bat\r
-       @echo cd typetest >typetest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat\r
-       call typetest.bat\r
-       @del typetest.bat\r
-       @echo cd validate >validate.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat\r
-       call validate.bat\r
-       @del validate.bat\r
-       @echo cd vscroll >vscroll.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>vscroll.bat\r
-       call vscroll.bat\r
-       @del vscroll.bat\r
-       @echo cd widgets >widgets.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widgets.bat\r
-       call widgets.bat\r
-       @del widgets.bat\r
-       @echo cd wizard >wizard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat\r
-       call wizard.bat\r
-       @del wizard.bat\r
-       @echo cd wrapsizer >wrapsizer.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat\r
-       call wrapsizer.bat\r
-       @del wrapsizer.bat\r
-       @echo cd xrc >xrc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>xrc.bat\r
-       call xrc.bat\r
-       @del xrc.bat\r
-       @echo cd memcheck >memcheck.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat\r
-       call memcheck.bat\r
-       @del memcheck.bat\r
-\r
-access: \r
-       @echo cd access >access.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>access.bat\r
-       call access.bat\r
-       @del access.bat\r
-\r
-animate: \r
-       @echo cd animate >animate.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>animate.bat\r
-       call animate.bat\r
-       @del animate.bat\r
-\r
-artprov: \r
-       @echo cd artprov >artprov.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>artprov.bat\r
-       call artprov.bat\r
-       @del artprov.bat\r
-\r
-aui: \r
-       @echo cd aui >aui.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat\r
-       call aui.bat\r
-       @del aui.bat\r
-\r
-calendar: \r
-       @echo cd calendar >calendar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>calendar.bat\r
-       call calendar.bat\r
-       @del calendar.bat\r
-\r
-caret: \r
-       @echo cd caret >caret.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>caret.bat\r
-       call caret.bat\r
-       @del caret.bat\r
-\r
-clipboard: \r
-       @echo cd clipboard >clipboard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>clipboard.bat\r
-       call clipboard.bat\r
-       @del clipboard.bat\r
-\r
-collpane: \r
-       @echo cd collpane >collpane.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>collpane.bat\r
-       call collpane.bat\r
-       @del collpane.bat\r
-\r
-combo: \r
-       @echo cd combo >combo.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat\r
-       call combo.bat\r
-       @del combo.bat\r
-\r
-config: \r
-       @echo cd config >config.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat\r
-       call config.bat\r
-       @del config.bat\r
-\r
-console: \r
-       @echo cd console >console.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat\r
-       call console.bat\r
-       @del console.bat\r
-\r
-controls: \r
-       @echo cd controls >controls.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>controls.bat\r
-       call controls.bat\r
-       @del controls.bat\r
-\r
-dataview: \r
-       @echo cd dataview >dataview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dataview.bat\r
-       call dataview.bat\r
-       @del dataview.bat\r
-\r
-dialogs: \r
-       @echo cd dialogs >dialogs.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialogs.bat\r
-       call dialogs.bat\r
-       @del dialogs.bat\r
-\r
-dialup: \r
-       @echo cd dialup >dialup.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialup.bat\r
-       call dialup.bat\r
-       @del dialup.bat\r
-\r
-display: \r
-       @echo cd display >display.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>display.bat\r
-       call display.bat\r
-       @del display.bat\r
-\r
-dnd: \r
-       @echo cd dnd >dnd.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dnd.bat\r
-       call dnd.bat\r
-       @del dnd.bat\r
-\r
-docview: \r
-       @echo cd docview >docview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>docview.bat\r
-       call docview.bat\r
-       @del docview.bat\r
-\r
-dragimag: \r
-       @echo cd dragimag >dragimag.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dragimag.bat\r
-       call dragimag.bat\r
-       @del dragimag.bat\r
-\r
-drawing: \r
-       @echo cd drawing >drawing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>drawing.bat\r
-       call drawing.bat\r
-       @del drawing.bat\r
-\r
-erase: \r
-       @echo cd erase >erase.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>erase.bat\r
-       call erase.bat\r
-       @del erase.bat\r
-\r
-event: \r
-       @echo cd event >event.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>event.bat\r
-       call event.bat\r
-       @del event.bat\r
-\r
-except: \r
-       @echo cd except >except.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat\r
-       call except.bat\r
-       @del except.bat\r
-\r
-exec: \r
-       @echo cd exec >exec.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat\r
-       call exec.bat\r
-       @del exec.bat\r
-\r
-font: \r
-       @echo cd font >font.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>font.bat\r
-       call font.bat\r
-       @del font.bat\r
-\r
-grid: \r
-       @echo cd grid >grid.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>grid.bat\r
-       call grid.bat\r
-       @del grid.bat\r
-\r
-help: \r
-       @echo cd help >help.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat\r
-       call help.bat\r
-       @del help.bat\r
-\r
-htlbox: \r
-       @echo cd htlbox >htlbox.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat\r
-       call htlbox.bat\r
-       @del htlbox.bat\r
-\r
-html: \r
-       @echo cd html >html.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat\r
-       call html.bat\r
-       @del html.bat\r
-\r
-image: \r
-       @echo cd image >image.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>image.bat\r
-       call image.bat\r
-       @del image.bat\r
-\r
-internat: \r
-       @echo cd internat >internat.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>internat.bat\r
-       call internat.bat\r
-       @del internat.bat\r
-\r
-ipc: \r
-       @echo cd ipc >ipc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ipc.bat\r
-       call ipc.bat\r
-       @del ipc.bat\r
-\r
-joytest: \r
-       @echo cd joytest >joytest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>joytest.bat\r
-       call joytest.bat\r
-       @del joytest.bat\r
-\r
-keyboard: \r
-       @echo cd keyboard >keyboard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>keyboard.bat\r
-       call keyboard.bat\r
-       @del keyboard.bat\r
-\r
-layout: \r
-       @echo cd layout >layout.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>layout.bat\r
-       call layout.bat\r
-       @del layout.bat\r
-\r
-listctrl: \r
-       @echo cd listctrl >listctrl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>listctrl.bat\r
-       call listctrl.bat\r
-       @del listctrl.bat\r
-\r
-mdi: \r
-       @echo cd mdi >mdi.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mdi.bat\r
-       call mdi.bat\r
-       @del mdi.bat\r
-\r
-mediaplayer: \r
-       @echo cd mediaplayer >mediaplayer.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat\r
-       call mediaplayer.bat\r
-       @del mediaplayer.bat\r
-\r
-menu: \r
-       @echo cd menu >menu.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat\r
-       call menu.bat\r
-       @del menu.bat\r
-\r
-minimal: \r
-       @echo cd minimal >minimal.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minimal.bat\r
-       call minimal.bat\r
-       @del minimal.bat\r
-\r
-nativdlg: \r
-       @echo cd nativdlg >nativdlg.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>nativdlg.bat\r
-       call nativdlg.bat\r
-       @del nativdlg.bat\r
-\r
-notebook: \r
-       @echo cd notebook >notebook.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>notebook.bat\r
-       call notebook.bat\r
-       @del notebook.bat\r
-\r
-oleauto: \r
-       @echo cd oleauto >oleauto.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>oleauto.bat\r
-       call oleauto.bat\r
-       @del oleauto.bat\r
-\r
-opengl: \r
-       @echo cd opengl >opengl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>opengl.bat\r
-       call opengl.bat\r
-       @del opengl.bat\r
-\r
-ownerdrw: \r
-       @echo cd ownerdrw >ownerdrw.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ownerdrw.bat\r
-       call ownerdrw.bat\r
-       @del ownerdrw.bat\r
-\r
-popup: \r
-       @echo cd popup >popup.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>popup.bat\r
-       call popup.bat\r
-       @del popup.bat\r
-\r
-power: \r
-       @echo cd power >power.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>power.bat\r
-       call power.bat\r
-       @del power.bat\r
-\r
-printing: \r
-       @echo cd printing >printing.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat\r
-       call printing.bat\r
-       @del printing.bat\r
-\r
-propgrid: \r
-       @echo cd propgrid >propgrid.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat\r
-       call propgrid.bat\r
-       @del propgrid.bat\r
-\r
-regtest: \r
-       @echo cd regtest >regtest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>regtest.bat\r
-       call regtest.bat\r
-       @del regtest.bat\r
-\r
-render: \r
-       @echo cd render >render.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>render.bat\r
-       call render.bat\r
-       @del render.bat\r
-\r
-ribbon: \r
-       @echo cd ribbon >ribbon.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat\r
-       call ribbon.bat\r
-       @del ribbon.bat\r
-\r
-richtext: \r
-       @echo cd richtext >richtext.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat\r
-       call richtext.bat\r
-       @del richtext.bat\r
-\r
-sashtest: \r
-       @echo cd sashtest >sashtest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sashtest.bat\r
-       call sashtest.bat\r
-       @del sashtest.bat\r
-\r
-scroll: \r
-       @echo cd scroll >scroll.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>scroll.bat\r
-       call scroll.bat\r
-       @del scroll.bat\r
-\r
-shaped: \r
-       @echo cd shaped >shaped.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>shaped.bat\r
-       call shaped.bat\r
-       @del shaped.bat\r
-\r
-sockets: \r
-       @echo cd sockets >sockets.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sockets.bat\r
-       call sockets.bat\r
-       @del sockets.bat\r
-\r
-sound: \r
-       @echo cd sound >sound.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sound.bat\r
-       call sound.bat\r
-       @del sound.bat\r
-\r
-splash: \r
-       @echo cd splash >splash.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat\r
-       call splash.bat\r
-       @del splash.bat\r
-\r
-splitter: \r
-       @echo cd splitter >splitter.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splitter.bat\r
-       call splitter.bat\r
-       @del splitter.bat\r
-\r
-statbar: \r
-       @echo cd statbar >statbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>statbar.bat\r
-       call statbar.bat\r
-       @del statbar.bat\r
-\r
-stc: \r
-       @echo cd stc >stc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat\r
-       call stc.bat\r
-       @del stc.bat\r
-\r
-svg: \r
-       @echo cd svg >svg.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>svg.bat\r
-       call svg.bat\r
-       @del svg.bat\r
-\r
-taborder: \r
-       @echo cd taborder >taborder.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taborder.bat\r
-       call taborder.bat\r
-       @del taborder.bat\r
-\r
-taskbar: \r
-       @echo cd taskbar >taskbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat\r
-       call taskbar.bat\r
-       @del taskbar.bat\r
-\r
-text: \r
-       @echo cd text >text.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>text.bat\r
-       call text.bat\r
-       @del text.bat\r
-\r
-thread: \r
-       @echo cd thread >thread.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>thread.bat\r
-       call thread.bat\r
-       @del thread.bat\r
-\r
-toolbar: \r
-       @echo cd toolbar >toolbar.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>toolbar.bat\r
-       call toolbar.bat\r
-       @del toolbar.bat\r
-\r
-treectrl: \r
-       @echo cd treectrl >treectrl.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>treectrl.bat\r
-       call treectrl.bat\r
-       @del treectrl.bat\r
-\r
-typetest: \r
-       @echo cd typetest >typetest.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>typetest.bat\r
-       call typetest.bat\r
-       @del typetest.bat\r
-\r
-validate: \r
-       @echo cd validate >validate.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat\r
-       call validate.bat\r
-       @del validate.bat\r
-\r
-vscroll: \r
-       @echo cd vscroll >vscroll.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>vscroll.bat\r
-       call vscroll.bat\r
-       @del vscroll.bat\r
-\r
-widgets: \r
-       @echo cd widgets >widgets.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widgets.bat\r
-       call widgets.bat\r
-       @del widgets.bat\r
-\r
-wizard: \r
-       @echo cd wizard >wizard.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wizard.bat\r
-       call wizard.bat\r
-       @del wizard.bat\r
-\r
-wrapsizer: \r
-       @echo cd wrapsizer >wrapsizer.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wrapsizer.bat\r
-       call wrapsizer.bat\r
-       @del wrapsizer.bat\r
-\r
-xrc: \r
-       @echo cd xrc >xrc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat\r
-       call xrc.bat\r
-       @del xrc.bat\r
-\r
-memcheck: \r
-       @echo cd memcheck >memcheck.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat\r
-       call memcheck.bat\r
-       @del memcheck.bat\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
+       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd access >access.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>access.bat
+       call access.bat
+       @del access.bat
+       @echo cd animate >animate.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>animate.bat
+       call animate.bat
+       @del animate.bat
+       @echo cd artprov >artprov.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>artprov.bat
+       call artprov.bat
+       @del artprov.bat
+       @echo cd aui >aui.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>aui.bat
+       call aui.bat
+       @del aui.bat
+       @echo cd calendar >calendar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>calendar.bat
+       call calendar.bat
+       @del calendar.bat
+       @echo cd caret >caret.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>caret.bat
+       call caret.bat
+       @del caret.bat
+       @echo cd clipboard >clipboard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>clipboard.bat
+       call clipboard.bat
+       @del clipboard.bat
+       @echo cd collpane >collpane.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat
+       call collpane.bat
+       @del collpane.bat
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat
+       call combo.bat
+       @del combo.bat
+       @echo cd config >config.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
+       call config.bat
+       @del config.bat
+       @echo cd console >console.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat
+       call console.bat
+       @del console.bat
+       @echo cd controls >controls.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>controls.bat
+       call controls.bat
+       @del controls.bat
+       @echo cd dataview >dataview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat
+       call dataview.bat
+       @del dataview.bat
+       @echo cd dialogs >dialogs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialogs.bat
+       call dialogs.bat
+       @del dialogs.bat
+       @echo cd dialup >dialup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialup.bat
+       call dialup.bat
+       @del dialup.bat
+       @echo cd display >display.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>display.bat
+       call display.bat
+       @del display.bat
+       @echo cd dnd >dnd.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dnd.bat
+       call dnd.bat
+       @del dnd.bat
+       @echo cd docview >docview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docview.bat
+       call docview.bat
+       @del docview.bat
+       @echo cd dragimag >dragimag.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dragimag.bat
+       call dragimag.bat
+       @del dragimag.bat
+       @echo cd drawing >drawing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>drawing.bat
+       call drawing.bat
+       @del drawing.bat
+       @echo cd erase >erase.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>erase.bat
+       call erase.bat
+       @del erase.bat
+       @echo cd event >event.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>event.bat
+       call event.bat
+       @del event.bat
+       @echo cd except >except.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>except.bat
+       call except.bat
+       @del except.bat
+       @echo cd exec >exec.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat
+       call exec.bat
+       @del exec.bat
+       @echo cd font >font.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>font.bat
+       call font.bat
+       @del font.bat
+       @echo cd grid >grid.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>grid.bat
+       call grid.bat
+       @del grid.bat
+       @echo cd help >help.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat
+       call help.bat
+       @del help.bat
+       @echo cd htlbox >htlbox.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>htlbox.bat
+       call htlbox.bat
+       @del htlbox.bat
+       @echo cd html >html.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>html.bat
+       call html.bat
+       @del html.bat
+       @echo cd image >image.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>image.bat
+       call image.bat
+       @del image.bat
+       @echo cd internat >internat.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>internat.bat
+       call internat.bat
+       @del internat.bat
+       @echo cd ipc >ipc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ipc.bat
+       call ipc.bat
+       @del ipc.bat
+       @echo cd joytest >joytest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>joytest.bat
+       call joytest.bat
+       @del joytest.bat
+       @echo cd keyboard >keyboard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>keyboard.bat
+       call keyboard.bat
+       @del keyboard.bat
+       @echo cd layout >layout.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>layout.bat
+       call layout.bat
+       @del layout.bat
+       @echo cd listctrl >listctrl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>listctrl.bat
+       call listctrl.bat
+       @del listctrl.bat
+       @echo cd mdi >mdi.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mdi.bat
+       call mdi.bat
+       @del mdi.bat
+       @echo cd mediaplayer >mediaplayer.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat
+       call mediaplayer.bat
+       @del mediaplayer.bat
+       @echo cd menu >menu.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat
+       call menu.bat
+       @del menu.bat
+       @echo cd minimal >minimal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minimal.bat
+       call minimal.bat
+       @del minimal.bat
+       @echo cd nativdlg >nativdlg.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>nativdlg.bat
+       call nativdlg.bat
+       @del nativdlg.bat
+       @echo cd notebook >notebook.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>notebook.bat
+       call notebook.bat
+       @del notebook.bat
+       @echo cd oleauto >oleauto.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>oleauto.bat
+       call oleauto.bat
+       @del oleauto.bat
+       @echo cd opengl >opengl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>opengl.bat
+       call opengl.bat
+       @del opengl.bat
+       @echo cd ownerdrw >ownerdrw.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ownerdrw.bat
+       call ownerdrw.bat
+       @del ownerdrw.bat
+       @echo cd popup >popup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat
+       call popup.bat
+       @del popup.bat
+       @echo cd power >power.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat
+       call power.bat
+       @del power.bat
+       @echo cd printing >printing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
+       call printing.bat
+       @del printing.bat
+       @echo cd propgrid >propgrid.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>propgrid.bat
+       call propgrid.bat
+       @del propgrid.bat
+       @echo cd regtest >regtest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>regtest.bat
+       call regtest.bat
+       @del regtest.bat
+       @echo cd render >render.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat
+       call render.bat
+       @del render.bat
+       @echo cd ribbon >ribbon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ribbon.bat
+       call ribbon.bat
+       @del ribbon.bat
+       @echo cd richtext >richtext.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richtext.bat
+       call richtext.bat
+       @del richtext.bat
+       @echo cd sashtest >sashtest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sashtest.bat
+       call sashtest.bat
+       @del sashtest.bat
+       @echo cd scroll >scroll.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>scroll.bat
+       call scroll.bat
+       @del scroll.bat
+       @echo cd shaped >shaped.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>shaped.bat
+       call shaped.bat
+       @del shaped.bat
+       @echo cd sockets >sockets.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sockets.bat
+       call sockets.bat
+       @del sockets.bat
+       @echo cd sound >sound.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sound.bat
+       call sound.bat
+       @del sound.bat
+       @echo cd splash >splash.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splash.bat
+       call splash.bat
+       @del splash.bat
+       @echo cd splitter >splitter.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splitter.bat
+       call splitter.bat
+       @del splitter.bat
+       @echo cd statbar >statbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>statbar.bat
+       call statbar.bat
+       @del statbar.bat
+       @echo cd stc >stc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>stc.bat
+       call stc.bat
+       @del stc.bat
+       @echo cd svg >svg.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>svg.bat
+       call svg.bat
+       @del svg.bat
+       @echo cd taborder >taborder.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taborder.bat
+       call taborder.bat
+       @del taborder.bat
+       @echo cd taskbar >taskbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat
+       call taskbar.bat
+       @del taskbar.bat
+       @echo cd text >text.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>text.bat
+       call text.bat
+       @del text.bat
+       @echo cd thread >thread.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thread.bat
+       call thread.bat
+       @del thread.bat
+       @echo cd toolbar >toolbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>toolbar.bat
+       call toolbar.bat
+       @del toolbar.bat
+       @echo cd treectrl >treectrl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>treectrl.bat
+       call treectrl.bat
+       @del treectrl.bat
+       @echo cd typetest >typetest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat
+       call typetest.bat
+       @del typetest.bat
+       @echo cd validate >validate.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat
+       call validate.bat
+       @del validate.bat
+       @echo cd vscroll >vscroll.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>vscroll.bat
+       call vscroll.bat
+       @del vscroll.bat
+       @echo cd widgets >widgets.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widgets.bat
+       call widgets.bat
+       @del widgets.bat
+       @echo cd wizard >wizard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat
+       call wizard.bat
+       @del wizard.bat
+       @echo cd wrapsizer >wrapsizer.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat
+       call wrapsizer.bat
+       @del wrapsizer.bat
+       @echo cd xrc >xrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>xrc.bat
+       call xrc.bat
+       @del xrc.bat
+       @echo cd memcheck >memcheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat
+       call memcheck.bat
+       @del memcheck.bat
+
+access: 
+       @echo cd access >access.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>access.bat
+       call access.bat
+       @del access.bat
+
+animate: 
+       @echo cd animate >animate.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>animate.bat
+       call animate.bat
+       @del animate.bat
+
+artprov: 
+       @echo cd artprov >artprov.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>artprov.bat
+       call artprov.bat
+       @del artprov.bat
+
+aui: 
+       @echo cd aui >aui.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat
+       call aui.bat
+       @del aui.bat
+
+calendar: 
+       @echo cd calendar >calendar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>calendar.bat
+       call calendar.bat
+       @del calendar.bat
+
+caret: 
+       @echo cd caret >caret.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>caret.bat
+       call caret.bat
+       @del caret.bat
+
+clipboard: 
+       @echo cd clipboard >clipboard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>clipboard.bat
+       call clipboard.bat
+       @del clipboard.bat
+
+collpane: 
+       @echo cd collpane >collpane.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>collpane.bat
+       call collpane.bat
+       @del collpane.bat
+
+combo: 
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat
+       call combo.bat
+       @del combo.bat
+
+config: 
+       @echo cd config >config.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat
+       call config.bat
+       @del config.bat
+
+console: 
+       @echo cd console >console.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat
+       call console.bat
+       @del console.bat
+
+controls: 
+       @echo cd controls >controls.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>controls.bat
+       call controls.bat
+       @del controls.bat
+
+dataview: 
+       @echo cd dataview >dataview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dataview.bat
+       call dataview.bat
+       @del dataview.bat
+
+dialogs: 
+       @echo cd dialogs >dialogs.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialogs.bat
+       call dialogs.bat
+       @del dialogs.bat
+
+dialup: 
+       @echo cd dialup >dialup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialup.bat
+       call dialup.bat
+       @del dialup.bat
+
+display: 
+       @echo cd display >display.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>display.bat
+       call display.bat
+       @del display.bat
+
+dnd: 
+       @echo cd dnd >dnd.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dnd.bat
+       call dnd.bat
+       @del dnd.bat
+
+docview: 
+       @echo cd docview >docview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>docview.bat
+       call docview.bat
+       @del docview.bat
+
+dragimag: 
+       @echo cd dragimag >dragimag.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dragimag.bat
+       call dragimag.bat
+       @del dragimag.bat
+
+drawing: 
+       @echo cd drawing >drawing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>drawing.bat
+       call drawing.bat
+       @del drawing.bat
+
+erase: 
+       @echo cd erase >erase.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>erase.bat
+       call erase.bat
+       @del erase.bat
+
+event: 
+       @echo cd event >event.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>event.bat
+       call event.bat
+       @del event.bat
+
+except: 
+       @echo cd except >except.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat
+       call except.bat
+       @del except.bat
+
+exec: 
+       @echo cd exec >exec.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat
+       call exec.bat
+       @del exec.bat
+
+font: 
+       @echo cd font >font.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>font.bat
+       call font.bat
+       @del font.bat
+
+grid: 
+       @echo cd grid >grid.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>grid.bat
+       call grid.bat
+       @del grid.bat
+
+help: 
+       @echo cd help >help.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat
+       call help.bat
+       @del help.bat
+
+htlbox: 
+       @echo cd htlbox >htlbox.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat
+       call htlbox.bat
+       @del htlbox.bat
+
+html: 
+       @echo cd html >html.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat
+       call html.bat
+       @del html.bat
+
+image: 
+       @echo cd image >image.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>image.bat
+       call image.bat
+       @del image.bat
+
+internat: 
+       @echo cd internat >internat.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>internat.bat
+       call internat.bat
+       @del internat.bat
+
+ipc: 
+       @echo cd ipc >ipc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ipc.bat
+       call ipc.bat
+       @del ipc.bat
+
+joytest: 
+       @echo cd joytest >joytest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>joytest.bat
+       call joytest.bat
+       @del joytest.bat
+
+keyboard: 
+       @echo cd keyboard >keyboard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>keyboard.bat
+       call keyboard.bat
+       @del keyboard.bat
+
+layout: 
+       @echo cd layout >layout.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>layout.bat
+       call layout.bat
+       @del layout.bat
+
+listctrl: 
+       @echo cd listctrl >listctrl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>listctrl.bat
+       call listctrl.bat
+       @del listctrl.bat
+
+mdi: 
+       @echo cd mdi >mdi.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mdi.bat
+       call mdi.bat
+       @del mdi.bat
+
+mediaplayer: 
+       @echo cd mediaplayer >mediaplayer.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat
+       call mediaplayer.bat
+       @del mediaplayer.bat
+
+menu: 
+       @echo cd menu >menu.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat
+       call menu.bat
+       @del menu.bat
+
+minimal: 
+       @echo cd minimal >minimal.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minimal.bat
+       call minimal.bat
+       @del minimal.bat
+
+nativdlg: 
+       @echo cd nativdlg >nativdlg.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>nativdlg.bat
+       call nativdlg.bat
+       @del nativdlg.bat
+
+notebook: 
+       @echo cd notebook >notebook.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>notebook.bat
+       call notebook.bat
+       @del notebook.bat
+
+oleauto: 
+       @echo cd oleauto >oleauto.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>oleauto.bat
+       call oleauto.bat
+       @del oleauto.bat
+
+opengl: 
+       @echo cd opengl >opengl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>opengl.bat
+       call opengl.bat
+       @del opengl.bat
+
+ownerdrw: 
+       @echo cd ownerdrw >ownerdrw.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ownerdrw.bat
+       call ownerdrw.bat
+       @del ownerdrw.bat
+
+popup: 
+       @echo cd popup >popup.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>popup.bat
+       call popup.bat
+       @del popup.bat
+
+power: 
+       @echo cd power >power.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>power.bat
+       call power.bat
+       @del power.bat
+
+printing: 
+       @echo cd printing >printing.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat
+       call printing.bat
+       @del printing.bat
+
+propgrid: 
+       @echo cd propgrid >propgrid.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat
+       call propgrid.bat
+       @del propgrid.bat
+
+regtest: 
+       @echo cd regtest >regtest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>regtest.bat
+       call regtest.bat
+       @del regtest.bat
+
+render: 
+       @echo cd render >render.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>render.bat
+       call render.bat
+       @del render.bat
+
+ribbon: 
+       @echo cd ribbon >ribbon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat
+       call ribbon.bat
+       @del ribbon.bat
+
+richtext: 
+       @echo cd richtext >richtext.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat
+       call richtext.bat
+       @del richtext.bat
+
+sashtest: 
+       @echo cd sashtest >sashtest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sashtest.bat
+       call sashtest.bat
+       @del sashtest.bat
+
+scroll: 
+       @echo cd scroll >scroll.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>scroll.bat
+       call scroll.bat
+       @del scroll.bat
+
+shaped: 
+       @echo cd shaped >shaped.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>shaped.bat
+       call shaped.bat
+       @del shaped.bat
+
+sockets: 
+       @echo cd sockets >sockets.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sockets.bat
+       call sockets.bat
+       @del sockets.bat
+
+sound: 
+       @echo cd sound >sound.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sound.bat
+       call sound.bat
+       @del sound.bat
+
+splash: 
+       @echo cd splash >splash.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat
+       call splash.bat
+       @del splash.bat
+
+splitter: 
+       @echo cd splitter >splitter.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splitter.bat
+       call splitter.bat
+       @del splitter.bat
+
+statbar: 
+       @echo cd statbar >statbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>statbar.bat
+       call statbar.bat
+       @del statbar.bat
+
+stc: 
+       @echo cd stc >stc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat
+       call stc.bat
+       @del stc.bat
+
+svg: 
+       @echo cd svg >svg.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>svg.bat
+       call svg.bat
+       @del svg.bat
+
+taborder: 
+       @echo cd taborder >taborder.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taborder.bat
+       call taborder.bat
+       @del taborder.bat
+
+taskbar: 
+       @echo cd taskbar >taskbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat
+       call taskbar.bat
+       @del taskbar.bat
+
+text: 
+       @echo cd text >text.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>text.bat
+       call text.bat
+       @del text.bat
+
+thread: 
+       @echo cd thread >thread.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>thread.bat
+       call thread.bat
+       @del thread.bat
+
+toolbar: 
+       @echo cd toolbar >toolbar.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>toolbar.bat
+       call toolbar.bat
+       @del toolbar.bat
+
+treectrl: 
+       @echo cd treectrl >treectrl.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>treectrl.bat
+       call treectrl.bat
+       @del treectrl.bat
+
+typetest: 
+       @echo cd typetest >typetest.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>typetest.bat
+       call typetest.bat
+       @del typetest.bat
+
+validate: 
+       @echo cd validate >validate.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat
+       call validate.bat
+       @del validate.bat
+
+vscroll: 
+       @echo cd vscroll >vscroll.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>vscroll.bat
+       call vscroll.bat
+       @del vscroll.bat
+
+widgets: 
+       @echo cd widgets >widgets.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widgets.bat
+       call widgets.bat
+       @del widgets.bat
+
+wizard: 
+       @echo cd wizard >wizard.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wizard.bat
+       call wizard.bat
+       @del wizard.bat
+
+wrapsizer: 
+       @echo cd wrapsizer >wrapsizer.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wrapsizer.bat
+       call wrapsizer.bat
+       @del wrapsizer.bat
+
+xrc: 
+       @echo cd xrc >xrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat
+       call xrc.bat
+       @del xrc.bat
+
+memcheck: 
+       @echo cd memcheck >memcheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat
+       call memcheck.bat
+       @del memcheck.bat
+

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 7ca2de6c8d91ef385bb3080297d29b9dab276bbe..e52eadc1ad388774874391aef4c0802d752e064d 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,366 +1,366 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc\r
-\r
-clean: \r
-       -if exist .\*.o del .\*.o\r
-       -if exist .\*.d del .\*.d\r
-       $(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C html -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C image -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean\r
-\r
-access: \r
-       $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all\r
-\r
-animate: \r
-       $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) all\r
-\r
-artprov: \r
-       $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all\r
-\r
-aui: \r
-       $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all\r
-\r
-calendar: \r
-       $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all\r
-\r
-caret: \r
-       $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all\r
-\r
-clipboard: \r
-       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) all\r
-\r
-collpane: \r
-       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all\r
-\r
-combo: \r
-       $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all\r
-\r
-config: \r
-       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all\r
-\r
-console: \r
-       $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all\r
-\r
-controls: \r
-       $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all\r
-\r
-dataview: \r
-       $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all\r
-\r
-dialogs: \r
-       $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all\r
-\r
-dialup: \r
-       $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) all\r
-\r
-display: \r
-       $(MAKE) -C display -f makefile.gcc $(MAKEARGS) all\r
-\r
-dnd: \r
-       $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all\r
-\r
-docview: \r
-       $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all\r
-\r
-dragimag: \r
-       $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all\r
-\r
-drawing: \r
-       $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all\r
-\r
-erase: \r
-       $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all\r
-\r
-event: \r
-       $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all\r
-\r
-except: \r
-       $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all\r
-\r
-exec: \r
-       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all\r
-\r
-font: \r
-       $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all\r
-\r
-grid: \r
-       $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all\r
-\r
-help: \r
-       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all\r
-\r
-htlbox: \r
-       $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all\r
-\r
-html: \r
-       $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all\r
-\r
-image: \r
-       $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all\r
-\r
-internat: \r
-       $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) all\r
-\r
-ipc: \r
-       $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) all\r
-\r
-joytest: \r
-       $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) all\r
-\r
-keyboard: \r
-       $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) all\r
-\r
-layout: \r
-       $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all\r
-\r
-listctrl: \r
-       $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all\r
-\r
-mdi: \r
-       $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all\r
-\r
-mediaplayer: \r
-       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all\r
-\r
-menu: \r
-       $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all\r
-\r
-minimal: \r
-       $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all\r
-\r
-nativdlg: \r
-       $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all\r
-\r
-notebook: \r
-       $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all\r
-\r
-oleauto: \r
-       $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) all\r
-\r
-opengl: \r
-       $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) all\r
-\r
-ownerdrw: \r
-       $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all\r
-\r
-popup: \r
-       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all\r
-\r
-power: \r
-       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all\r
-\r
-printing: \r
-       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all\r
-\r
-propgrid: \r
-       $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all\r
-\r
-regtest: \r
-       $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all\r
-\r
-render: \r
-       $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all\r
-\r
-ribbon: \r
-       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all\r
-\r
-richtext: \r
-       $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all\r
-\r
-sashtest: \r
-       $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all\r
-\r
-scroll: \r
-       $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all\r
-\r
-shaped: \r
-       $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all\r
-\r
-sockets: \r
-       $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) all\r
-\r
-sound: \r
-       $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all\r
-\r
-splash: \r
-       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all\r
-\r
-splitter: \r
-       $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all\r
-\r
-statbar: \r
-       $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all\r
-\r
-stc: \r
-       $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all\r
-\r
-svg: \r
-       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all\r
-\r
-taborder: \r
-       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all\r
-\r
-taskbar: \r
-       $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all\r
-\r
-text: \r
-       $(MAKE) -C text -f makefile.gcc $(MAKEARGS) all\r
-\r
-thread: \r
-       $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) all\r
-\r
-toolbar: \r
-       $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) all\r
-\r
-treectrl: \r
-       $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) all\r
-\r
-typetest: \r
-       $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all\r
-\r
-validate: \r
-       $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all\r
-\r
-vscroll: \r
-       $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all\r
-\r
-widgets: \r
-       $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all\r
-\r
-wizard: \r
-       $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all\r
-\r
-wrapsizer: \r
-       $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all\r
-\r
-xrc: \r
-       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all\r
-\r
-memcheck: \r
-       $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all\r
-\r
-.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \\r
-       config console controls dataview dialogs dialup display dnd docview dragimag \\r
-       drawing erase event except exec font grid help htlbox html image internat ipc joytest \\r
-       keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \\r
-       opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \\r
-       sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \\r
-       taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \\r
-       wrapsizer xrc memcheck\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include ./*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
+
+clean: 
+       -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C html -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C image -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
+
+access: 
+       $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all
+
+animate: 
+       $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) all
+
+artprov: 
+       $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all
+
+aui: 
+       $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all
+
+calendar: 
+       $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all
+
+caret: 
+       $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
+
+clipboard: 
+       $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) all
+
+collpane: 
+       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
+
+combo: 
+       $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all
+
+config: 
+       $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
+
+console: 
+       $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all
+
+controls: 
+       $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all
+
+dataview: 
+       $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all
+
+dialogs: 
+       $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all
+
+dialup: 
+       $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) all
+
+display: 
+       $(MAKE) -C display -f makefile.gcc $(MAKEARGS) all
+
+dnd: 
+       $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all
+
+docview: 
+       $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all
+
+dragimag: 
+       $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all
+
+drawing: 
+       $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all
+
+erase: 
+       $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all
+
+event: 
+       $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
+
+except: 
+       $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
+
+exec: 
+       $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
+
+font: 
+       $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all
+
+grid: 
+       $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all
+
+help: 
+       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
+
+htlbox: 
+       $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all
+
+html: 
+       $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all
+
+image: 
+       $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all
+
+internat: 
+       $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) all
+
+ipc: 
+       $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) all
+
+joytest: 
+       $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) all
+
+keyboard: 
+       $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) all
+
+layout: 
+       $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all
+
+listctrl: 
+       $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all
+
+mdi: 
+       $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all
+
+mediaplayer: 
+       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all
+
+menu: 
+       $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
+
+minimal: 
+       $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
+
+nativdlg: 
+       $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
+
+notebook: 
+       $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all
+
+oleauto: 
+       $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) all
+
+opengl: 
+       $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) all
+
+ownerdrw: 
+       $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all
+
+popup: 
+       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
+
+power: 
+       $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all
+
+printing: 
+       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
+
+propgrid: 
+       $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all
+
+regtest: 
+       $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all
+
+render: 
+       $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
+
+ribbon: 
+       $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all
+
+richtext: 
+       $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
+
+sashtest: 
+       $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
+
+scroll: 
+       $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all
+
+shaped: 
+       $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all
+
+sockets: 
+       $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) all
+
+sound: 
+       $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all
+
+splash: 
+       $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all
+
+splitter: 
+       $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all
+
+statbar: 
+       $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all
+
+stc: 
+       $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all
+
+svg: 
+       $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all
+
+taborder: 
+       $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all
+
+taskbar: 
+       $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
+
+text: 
+       $(MAKE) -C text -f makefile.gcc $(MAKEARGS) all
+
+thread: 
+       $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) all
+
+toolbar: 
+       $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) all
+
+treectrl: 
+       $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) all
+
+typetest: 
+       $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all
+
+validate: 
+       $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all
+
+vscroll: 
+       $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all
+
+widgets: 
+       $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all
+
+wizard: 
+       $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
+
+wrapsizer: 
+       $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
+
+xrc: 
+       $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all
+
+memcheck: 
+       $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \
+       config console controls dataview dialogs dialup display dnd docview dragimag \
+       drawing erase event except exec font grid help htlbox html image internat ipc joytest \
+       keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
+       opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \
+       sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \
+       taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \
+       wrapsizer xrc memcheck
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 3329498ebf428c1738f716bb2479ab52ce12186f..2f5103f6798dff10ef4f944a7d6b1a67bc5b06c7 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -1,676 +1,676 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
-       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.pch del .\*.pch\r
-       cd access\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd animate\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd artprov\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd aui\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd calendar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd caret\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd clipboard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd collpane\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd combo\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd config\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd console\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd controls\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd dataview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd dialogs\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd dialup\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd display\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd dnd\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd docview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd dragimag\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd drawing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd erase\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd event\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd except\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd exec\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd font\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd grid\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd help\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd htlbox\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd html\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd image\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd internat\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd ipc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd joytest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd keyboard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd layout\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd listctrl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd mdi\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd mediaplayer\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd menu\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd minimal\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd nativdlg\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd notebook\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd oleauto\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd opengl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd ownerdrw\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd popup\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd power\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd printing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd propgrid\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd regtest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd render\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd ribbon\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd richtext\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd sashtest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd scroll\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd shaped\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd sockets\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd sound\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd splash\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd splitter\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd statbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd stc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd svg\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd taborder\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd taskbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd text\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd thread\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd toolbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd treectrl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd typetest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd validate\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd vscroll\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd widgets\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd wizard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd wrapsizer\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd xrc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd flash\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd mfc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd memcheck\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_access: \r
-       cd access\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_animate: \r
-       cd animate\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_artprov: \r
-       cd artprov\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_aui: \r
-       cd aui\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_calendar: \r
-       cd calendar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_caret: \r
-       cd caret\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_clipboard: \r
-       cd clipboard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_collpane: \r
-       cd collpane\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_combo: \r
-       cd combo\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_config: \r
-       cd config\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_console: \r
-       cd console\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_controls: \r
-       cd controls\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_dataview: \r
-       cd dataview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_dialogs: \r
-       cd dialogs\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_dialup: \r
-       cd dialup\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_display: \r
-       cd display\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_dnd: \r
-       cd dnd\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_docview: \r
-       cd docview\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_dragimag: \r
-       cd dragimag\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_drawing: \r
-       cd drawing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_erase: \r
-       cd erase\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_event: \r
-       cd event\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_except: \r
-       cd except\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_exec: \r
-       cd exec\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_font: \r
-       cd font\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_grid: \r
-       cd grid\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_help: \r
-       cd help\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_htlbox: \r
-       cd htlbox\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_html: \r
-       cd html\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_image: \r
-       cd image\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_internat: \r
-       cd internat\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_ipc: \r
-       cd ipc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_joytest: \r
-       cd joytest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_keyboard: \r
-       cd keyboard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_layout: \r
-       cd layout\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_listctrl: \r
-       cd listctrl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_mdi: \r
-       cd mdi\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_mediaplayer: \r
-       cd mediaplayer\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_menu: \r
-       cd menu\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_minimal: \r
-       cd minimal\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_nativdlg: \r
-       cd nativdlg\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_notebook: \r
-       cd notebook\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_oleauto: \r
-       cd oleauto\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_opengl: \r
-       cd opengl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_ownerdrw: \r
-       cd ownerdrw\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_popup: \r
-       cd popup\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_power: \r
-       cd power\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_printing: \r
-       cd printing\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_propgrid: \r
-       cd propgrid\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_regtest: \r
-       cd regtest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_render: \r
-       cd render\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_ribbon: \r
-       cd ribbon\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_richtext: \r
-       cd richtext\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_sashtest: \r
-       cd sashtest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_scroll: \r
-       cd scroll\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_shaped: \r
-       cd shaped\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_sockets: \r
-       cd sockets\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_sound: \r
-       cd sound\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_splash: \r
-       cd splash\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_splitter: \r
-       cd splitter\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_statbar: \r
-       cd statbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_stc: \r
-       cd stc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_svg: \r
-       cd svg\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_taborder: \r
-       cd taborder\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_taskbar: \r
-       cd taskbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_text: \r
-       cd text\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_thread: \r
-       cd thread\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_toolbar: \r
-       cd toolbar\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_treectrl: \r
-       cd treectrl\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_typetest: \r
-       cd typetest\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_validate: \r
-       cd validate\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_vscroll: \r
-       cd vscroll\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_widgets: \r
-       cd widgets\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_wizard: \r
-       cd wizard\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_wrapsizer: \r
-       cd wrapsizer\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_xrc: \r
-       cd xrc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_flash: \r
-       cd flash\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_mfc: \r
-       cd mfc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_memcheck: \r
-       cd memcheck\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd access
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd animate
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd artprov
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd aui
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd calendar
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd caret
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd clipboard
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd collpane
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd combo
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd config
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd console
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd controls
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd dataview
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd dialogs
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd dialup
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd display
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd dnd
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd docview
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd dragimag
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd drawing
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd erase
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd event
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd except
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd exec
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd font
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd grid
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd help
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd htlbox
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd html
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd image
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd internat
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd ipc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd joytest
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd keyboard
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd layout
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd listctrl
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd mdi
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd mediaplayer
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd menu
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd minimal
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd nativdlg
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd notebook
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd oleauto
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd opengl
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd ownerdrw
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd popup
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd power
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd printing
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd propgrid
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd regtest
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd render
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd ribbon
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd richtext
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd sashtest
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd scroll
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd shaped
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd sockets
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd sound
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd splash
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd splitter
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd statbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd stc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd svg
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd taborder
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd taskbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd text
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd thread
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd toolbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd treectrl
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd typetest
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd validate
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd vscroll
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd widgets
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd wizard
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd wrapsizer
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd xrc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd flash
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd mfc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd memcheck
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+
+sub_access: 
+       cd access
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_animate: 
+       cd animate
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_artprov: 
+       cd artprov
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_aui: 
+       cd aui
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_calendar: 
+       cd calendar
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_caret: 
+       cd caret
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_clipboard: 
+       cd clipboard
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_collpane: 
+       cd collpane
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_combo: 
+       cd combo
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_config: 
+       cd config
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_console: 
+       cd console
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_controls: 
+       cd controls
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_dataview: 
+       cd dataview
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_dialogs: 
+       cd dialogs
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_dialup: 
+       cd dialup
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_display: 
+       cd display
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_dnd: 
+       cd dnd
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_docview: 
+       cd docview
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_dragimag: 
+       cd dragimag
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_drawing: 
+       cd drawing
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_erase: 
+       cd erase
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_event: 
+       cd event
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_except: 
+       cd except
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_exec: 
+       cd exec
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_font: 
+       cd font
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_grid: 
+       cd grid
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_help: 
+       cd help
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_htlbox: 
+       cd htlbox
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_html: 
+       cd html
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_image: 
+       cd image
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_internat: 
+       cd internat
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_ipc: 
+       cd ipc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_joytest: 
+       cd joytest
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_keyboard: 
+       cd keyboard
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_layout: 
+       cd layout
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_listctrl: 
+       cd listctrl
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_mdi: 
+       cd mdi
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_mediaplayer: 
+       cd mediaplayer
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_menu: 
+       cd menu
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_minimal: 
+       cd minimal
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_nativdlg: 
+       cd nativdlg
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_notebook: 
+       cd notebook
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_oleauto: 
+       cd oleauto
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_opengl: 
+       cd opengl
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_ownerdrw: 
+       cd ownerdrw
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_popup: 
+       cd popup
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_power: 
+       cd power
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_printing: 
+       cd printing
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_propgrid: 
+       cd propgrid
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_regtest: 
+       cd regtest
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_render: 
+       cd render
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_ribbon: 
+       cd ribbon
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_richtext: 
+       cd richtext
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_sashtest: 
+       cd sashtest
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_scroll: 
+       cd scroll
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_shaped: 
+       cd shaped
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_sockets: 
+       cd sockets
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_sound: 
+       cd sound
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_splash: 
+       cd splash
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_splitter: 
+       cd splitter
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_statbar: 
+       cd statbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_stc: 
+       cd stc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_svg: 
+       cd svg
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_taborder: 
+       cd taborder
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_taskbar: 
+       cd taskbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_text: 
+       cd text
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_thread: 
+       cd thread
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_toolbar: 
+       cd toolbar
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_treectrl: 
+       cd treectrl
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_typetest: 
+       cd typetest
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_validate: 
+       cd validate
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_vscroll: 
+       cd vscroll
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_widgets: 
+       cd widgets
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_wizard: 
+       cd wizard
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_wrapsizer: 
+       cd wrapsizer
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_xrc: 
+       cd xrc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_flash: 
+       cd flash
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_mfc: 
+       cd mfc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_memcheck: 
+       cd memcheck
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+

diff --git a/samples/makefile.wat b/samples/makefile.wat
index 25d3fdebeb627565a78cfbb07d394dfbd4a4a9eb..ba6fcc6e5668a23de8145824fc08bba8bee2a5c7 100644 (file)
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -1,680 +1,680 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc\r
-\r
-clean : .SYMBOLIC \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.lbc del .\*.lbc\r
-       -if exist .\*.ilk del .\*.ilk\r
-       -if exist .\*.pch del .\*.pch\r
-       cd access\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd animate\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd artprov\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd aui\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd calendar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd caret\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd clipboard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd collpane\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd combo\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd config\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd console\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd controls\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd dataview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd dialogs\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd dialup\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd display\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd dnd\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd docview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd dragimag\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd drawing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd erase\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd event\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd except\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd exec\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd font\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd grid\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd help\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd htlbox\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd html\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd image\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd internat\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd ipc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd joytest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd keyboard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd layout\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd listctrl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd mdi\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd mediaplayer\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd menu\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd minimal\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd nativdlg\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd notebook\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd oleauto\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd opengl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd ownerdrw\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd popup\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd power\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd printing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd propgrid\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd regtest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd render\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd ribbon\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd richtext\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd sashtest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd scroll\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd shaped\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd sockets\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd sound\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd splash\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd splitter\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd statbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd stc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd svg\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd taborder\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd taskbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd text\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd thread\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd toolbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd treectrl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd typetest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd validate\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd vscroll\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd widgets\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd wizard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd wrapsizer\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd xrc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd memcheck\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-\r
-access : .SYMBOLIC \r
-       cd access\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-animate : .SYMBOLIC \r
-       cd animate\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-artprov : .SYMBOLIC \r
-       cd artprov\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-aui : .SYMBOLIC \r
-       cd aui\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-calendar : .SYMBOLIC \r
-       cd calendar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-caret : .SYMBOLIC \r
-       cd caret\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-clipboard : .SYMBOLIC \r
-       cd clipboard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-collpane : .SYMBOLIC \r
-       cd collpane\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-combo : .SYMBOLIC \r
-       cd combo\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-config : .SYMBOLIC \r
-       cd config\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-console : .SYMBOLIC \r
-       cd console\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-controls : .SYMBOLIC \r
-       cd controls\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-dataview : .SYMBOLIC \r
-       cd dataview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-dialogs : .SYMBOLIC \r
-       cd dialogs\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-dialup : .SYMBOLIC \r
-       cd dialup\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-display : .SYMBOLIC \r
-       cd display\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-dnd : .SYMBOLIC \r
-       cd dnd\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-docview : .SYMBOLIC \r
-       cd docview\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-dragimag : .SYMBOLIC \r
-       cd dragimag\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-drawing : .SYMBOLIC \r
-       cd drawing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-erase : .SYMBOLIC \r
-       cd erase\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-event : .SYMBOLIC \r
-       cd event\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-except : .SYMBOLIC \r
-       cd except\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-exec : .SYMBOLIC \r
-       cd exec\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-font : .SYMBOLIC \r
-       cd font\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-grid : .SYMBOLIC \r
-       cd grid\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-help : .SYMBOLIC \r
-       cd help\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-htlbox : .SYMBOLIC \r
-       cd htlbox\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-html : .SYMBOLIC \r
-       cd html\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-image : .SYMBOLIC \r
-       cd image\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-internat : .SYMBOLIC \r
-       cd internat\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-ipc : .SYMBOLIC \r
-       cd ipc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-joytest : .SYMBOLIC \r
-       cd joytest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-keyboard : .SYMBOLIC \r
-       cd keyboard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-layout : .SYMBOLIC \r
-       cd layout\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-listctrl : .SYMBOLIC \r
-       cd listctrl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-mdi : .SYMBOLIC \r
-       cd mdi\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-mediaplayer : .SYMBOLIC \r
-       cd mediaplayer\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-menu : .SYMBOLIC \r
-       cd menu\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-minimal : .SYMBOLIC \r
-       cd minimal\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-nativdlg : .SYMBOLIC \r
-       cd nativdlg\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-notebook : .SYMBOLIC \r
-       cd notebook\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-oleauto : .SYMBOLIC \r
-       cd oleauto\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-opengl : .SYMBOLIC \r
-       cd opengl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-ownerdrw : .SYMBOLIC \r
-       cd ownerdrw\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-popup : .SYMBOLIC \r
-       cd popup\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-power : .SYMBOLIC \r
-       cd power\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-printing : .SYMBOLIC \r
-       cd printing\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-propgrid : .SYMBOLIC \r
-       cd propgrid\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-regtest : .SYMBOLIC \r
-       cd regtest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-render : .SYMBOLIC \r
-       cd render\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-ribbon : .SYMBOLIC \r
-       cd ribbon\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-richtext : .SYMBOLIC \r
-       cd richtext\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-sashtest : .SYMBOLIC \r
-       cd sashtest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-scroll : .SYMBOLIC \r
-       cd scroll\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-shaped : .SYMBOLIC \r
-       cd shaped\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-sockets : .SYMBOLIC \r
-       cd sockets\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-sound : .SYMBOLIC \r
-       cd sound\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-splash : .SYMBOLIC \r
-       cd splash\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-splitter : .SYMBOLIC \r
-       cd splitter\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-statbar : .SYMBOLIC \r
-       cd statbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-stc : .SYMBOLIC \r
-       cd stc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-svg : .SYMBOLIC \r
-       cd svg\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-taborder : .SYMBOLIC \r
-       cd taborder\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-taskbar : .SYMBOLIC \r
-       cd taskbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-text : .SYMBOLIC \r
-       cd text\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-thread : .SYMBOLIC \r
-       cd thread\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-toolbar : .SYMBOLIC \r
-       cd toolbar\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-treectrl : .SYMBOLIC \r
-       cd treectrl\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-typetest : .SYMBOLIC \r
-       cd typetest\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-validate : .SYMBOLIC \r
-       cd validate\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-vscroll : .SYMBOLIC \r
-       cd vscroll\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-widgets : .SYMBOLIC \r
-       cd widgets\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-wizard : .SYMBOLIC \r
-       cd wizard\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-wrapsizer : .SYMBOLIC \r
-       cd wrapsizer\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-xrc : .SYMBOLIC \r
-       cd xrc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-memcheck : .SYMBOLIC \r
-       cd memcheck\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+
+### Targets: ###
+
+all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
+
+clean : .SYMBOLIC 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd access
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd animate
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd artprov
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd aui
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd calendar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd caret
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd clipboard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd collpane
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd combo
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd config
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd console
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd controls
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd dataview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd dialogs
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd dialup
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd display
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd dnd
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd docview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd dragimag
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd drawing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd erase
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd event
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd except
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd exec
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd font
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd grid
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd help
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd htlbox
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd html
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd image
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd internat
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd ipc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd joytest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd keyboard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd layout
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd listctrl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd mdi
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd mediaplayer
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd menu
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd minimal
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd nativdlg
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd notebook
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd oleauto
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd opengl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd ownerdrw
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd popup
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd power
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd printing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd propgrid
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd regtest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd render
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd ribbon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd richtext
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd sashtest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd scroll
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd shaped
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd sockets
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd sound
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd splash
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd splitter
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd statbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd stc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd svg
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd taborder
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd taskbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd text
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd thread
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd toolbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd treectrl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd typetest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd validate
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd vscroll
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd widgets
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd wizard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd wrapsizer
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd xrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd memcheck
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+access : .SYMBOLIC 
+       cd access
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+animate : .SYMBOLIC 
+       cd animate
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+artprov : .SYMBOLIC 
+       cd artprov
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+aui : .SYMBOLIC 
+       cd aui
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+calendar : .SYMBOLIC 
+       cd calendar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+caret : .SYMBOLIC 
+       cd caret
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+clipboard : .SYMBOLIC 
+       cd clipboard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+collpane : .SYMBOLIC 
+       cd collpane
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+combo : .SYMBOLIC 
+       cd combo
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+config : .SYMBOLIC 
+       cd config
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+console : .SYMBOLIC 
+       cd console
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+controls : .SYMBOLIC 
+       cd controls
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+dataview : .SYMBOLIC 
+       cd dataview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+dialogs : .SYMBOLIC 
+       cd dialogs
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+dialup : .SYMBOLIC 
+       cd dialup
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+display : .SYMBOLIC 
+       cd display
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+dnd : .SYMBOLIC 
+       cd dnd
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+docview : .SYMBOLIC 
+       cd docview
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+dragimag : .SYMBOLIC 
+       cd dragimag
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+drawing : .SYMBOLIC 
+       cd drawing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+erase : .SYMBOLIC 
+       cd erase
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+event : .SYMBOLIC 
+       cd event
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+except : .SYMBOLIC 
+       cd except
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+exec : .SYMBOLIC 
+       cd exec
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+font : .SYMBOLIC 
+       cd font
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+grid : .SYMBOLIC 
+       cd grid
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+help : .SYMBOLIC 
+       cd help
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+htlbox : .SYMBOLIC 
+       cd htlbox
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+html : .SYMBOLIC 
+       cd html
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+image : .SYMBOLIC 
+       cd image
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+internat : .SYMBOLIC 
+       cd internat
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+ipc : .SYMBOLIC 
+       cd ipc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+joytest : .SYMBOLIC 
+       cd joytest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+keyboard : .SYMBOLIC 
+       cd keyboard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+layout : .SYMBOLIC 
+       cd layout
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+listctrl : .SYMBOLIC 
+       cd listctrl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+mdi : .SYMBOLIC 
+       cd mdi
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+mediaplayer : .SYMBOLIC 
+       cd mediaplayer
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+menu : .SYMBOLIC 
+       cd menu
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+minimal : .SYMBOLIC 
+       cd minimal
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+nativdlg : .SYMBOLIC 
+       cd nativdlg
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+notebook : .SYMBOLIC 
+       cd notebook
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+oleauto : .SYMBOLIC 
+       cd oleauto
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+opengl : .SYMBOLIC 
+       cd opengl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+ownerdrw : .SYMBOLIC 
+       cd ownerdrw
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+popup : .SYMBOLIC 
+       cd popup
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+power : .SYMBOLIC 
+       cd power
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+printing : .SYMBOLIC 
+       cd printing
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+propgrid : .SYMBOLIC 
+       cd propgrid
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+regtest : .SYMBOLIC 
+       cd regtest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+render : .SYMBOLIC 
+       cd render
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+ribbon : .SYMBOLIC 
+       cd ribbon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+richtext : .SYMBOLIC 
+       cd richtext
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+sashtest : .SYMBOLIC 
+       cd sashtest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+scroll : .SYMBOLIC 
+       cd scroll
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+shaped : .SYMBOLIC 
+       cd shaped
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+sockets : .SYMBOLIC 
+       cd sockets
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+sound : .SYMBOLIC 
+       cd sound
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+splash : .SYMBOLIC 
+       cd splash
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+splitter : .SYMBOLIC 
+       cd splitter
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+statbar : .SYMBOLIC 
+       cd statbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+stc : .SYMBOLIC 
+       cd stc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+svg : .SYMBOLIC 
+       cd svg
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+taborder : .SYMBOLIC 
+       cd taborder
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+taskbar : .SYMBOLIC 
+       cd taskbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+text : .SYMBOLIC 
+       cd text
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+thread : .SYMBOLIC 
+       cd thread
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+toolbar : .SYMBOLIC 
+       cd toolbar
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+treectrl : .SYMBOLIC 
+       cd treectrl
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+typetest : .SYMBOLIC 
+       cd typetest
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+validate : .SYMBOLIC 
+       cd validate
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+vscroll : .SYMBOLIC 
+       cd vscroll
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+widgets : .SYMBOLIC 
+       cd widgets
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+wizard : .SYMBOLIC 
+       cd wizard
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+wrapsizer : .SYMBOLIC 
+       cd wrapsizer
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+xrc : .SYMBOLIC 
+       cd xrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+memcheck : .SYMBOLIC 
+       cd memcheck
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index fe8b693f31586e7b9a739e130b3a8a0c8c958f52..a9b18949fb80e310346ad9dc5965b4a0626ad77e 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc
index de521aebb63165cbe37923385a35a18f6f63d523..6bb65e99fd0deaf8b4b661afa090f91e99bd6a48 100644 (file)
--- a/samples/mdi/makefile.bcc
+++ b/samples/mdi/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-MDI_OBJECTS =  \\r
-       $(OBJS)\mdi_mdi.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mdi.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe\r
-       -if exist $(OBJS)\mdi.tds del $(OBJS)\mdi.tds\r
-       -if exist $(OBJS)\mdi.ilc del $(OBJS)\mdi.ilc\r
-       -if exist $(OBJS)\mdi.ild del $(OBJS)\mdi.ild\r
-       -if exist $(OBJS)\mdi.ilf del $(OBJS)\mdi.ilf\r
-       -if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils\r
-\r
-$(OBJS)\mdi.exe: $(MDI_OBJECTS)  $(OBJS)\mdi_mdi.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res\r
-|\r
-\r
-$(OBJS)\mdi_mdi.obj: .\mdi.cpp\r
-       $(CXX) -q -c -P -o$@ $(MDI_CXXFLAGS) .\mdi.cpp\r
-\r
-$(OBJS)\mdi_mdi.res: .\mdi.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\mdi.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+MDI_OBJECTS =  \
+       $(OBJS)\mdi_mdi.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mdi.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
+       -if exist $(OBJS)\mdi.tds del $(OBJS)\mdi.tds
+       -if exist $(OBJS)\mdi.ilc del $(OBJS)\mdi.ilc
+       -if exist $(OBJS)\mdi.ild del $(OBJS)\mdi.ild
+       -if exist $(OBJS)\mdi.ilf del $(OBJS)\mdi.ilf
+       -if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils
+
+$(OBJS)\mdi.exe: $(MDI_OBJECTS)  $(OBJS)\mdi_mdi.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res
+|
+
+$(OBJS)\mdi_mdi.obj: .\mdi.cpp
+       $(CXX) -q -c -P -o$@ $(MDI_CXXFLAGS) .\mdi.cpp
+
+$(OBJS)\mdi_mdi.res: .\mdi.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\mdi.rc
+

diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index 4ee7eac23add23041b45deb602fbb6abdb4c2f52..6846b7b2db4205fc140540830f71cf989b801b70 100644 (file)
--- a/samples/mdi/makefile.gcc
+++ b/samples/mdi/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MDI_OBJECTS =  \\r
-       $(OBJS)\mdi_mdi.o \\r
-       $(OBJS)\mdi_mdi_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mdi.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe\r
-\r
-$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o\r
-       $(CXX) -o $@ $(MDI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\mdi_mdi.o: ./mdi.cpp\r
-       $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\mdi_mdi_rc.o: ./mdi.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+MDI_OBJECTS =  \
+       $(OBJS)\mdi_mdi.o \
+       $(OBJS)\mdi_mdi_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mdi.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
+
+$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o
+       $(CXX) -o $@ $(MDI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\mdi_mdi.o: ./mdi.cpp
+       $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\mdi_mdi_rc.o: ./mdi.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx
index 2dc22a4cd34e33cb9208b7b188b97c3c71dcc256..eabe74ec96f2697cac7a75fdb6f95d1b3ace36c7 100644 (file)
--- a/samples/mdi/makefile.unx
+++ b/samples/mdi/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc
index 89a21750887596a197ca14842dbf4648ce62e2e5..4e758f64dee8c08ac2d425a97296b92141398cf4 100644 (file)
--- a/samples/mdi/makefile.vc
+++ b/samples/mdi/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MDI_OBJECTS =  \\r
-       $(OBJS)\mdi_mdi.obj \\r
-       $(OBJS)\mdi_mdi.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mdi.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe\r
-       -if exist $(OBJS)\mdi.ilk del $(OBJS)\mdi.ilk\r
-       -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb\r
-\r
-$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MDI_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\mdi_mdi.obj: .\mdi.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MDI_CXXFLAGS) .\mdi.cpp\r
-\r
-$(OBJS)\mdi_mdi.res: .\mdi.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mdi.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MDI_OBJECTS =  \
+       $(OBJS)\mdi_mdi.obj
+MDI_RESOURCES =  \
+       $(OBJS)\mdi_mdi.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mdi.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
+       -if exist $(OBJS)\mdi.ilk del $(OBJS)\mdi.ilk
+       -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb
+
+$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MDI_OBJECTS) $(MDI_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\mdi_mdi.obj: .\mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MDI_CXXFLAGS) .\mdi.cpp
+
+$(OBJS)\mdi_mdi.res: .\mdi.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mdi.rc
+

diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat
index 5cb18c42f875d7976a2596f8e6f318369662179c..1cf8ad7a9e7305c1a0af94318758ab103c0d6372 100644 (file)
--- a/samples/mdi/makefile.wat
+++ b/samples/mdi/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-MDI_OBJECTS =  &\r
-       $(OBJS)\mdi_mdi.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\mdi.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe\r
-\r
-$(OBJS)\mdi.exe :  $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res\r
-       @%create $(OBJS)\mdi.lbc\r
-       @%append $(OBJS)\mdi.lbc option quiet\r
-       @%append $(OBJS)\mdi.lbc name $^@\r
-       @%append $(OBJS)\mdi.lbc option caseexact\r
-       @%append $(OBJS)\mdi.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mdi.lbc library %i\r
-       @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res\r
-       @for %i in () do @%append $(OBJS)\mdi.lbc option stack=%i\r
-       wlink @$(OBJS)\mdi.lbc\r
-\r
-$(OBJS)\mdi_mdi.obj :  .AUTODEPEND .\mdi.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MDI_CXXFLAGS) $<\r
-\r
-$(OBJS)\mdi_mdi.res :  .AUTODEPEND .\mdi.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+MDI_OBJECTS =  &
+       $(OBJS)\mdi_mdi.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\mdi.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
+
+$(OBJS)\mdi.exe :  $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res
+       @%create $(OBJS)\mdi.lbc
+       @%append $(OBJS)\mdi.lbc option quiet
+       @%append $(OBJS)\mdi.lbc name $^@
+       @%append $(OBJS)\mdi.lbc option caseexact
+       @%append $(OBJS)\mdi.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mdi.lbc library %i
+       @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res
+       @for %i in () do @%append $(OBJS)\mdi.lbc option stack=%i
+       wlink @$(OBJS)\mdi.lbc
+
+$(OBJS)\mdi_mdi.obj :  .AUTODEPEND .\mdi.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MDI_CXXFLAGS) $<
+
+$(OBJS)\mdi_mdi.res :  .AUTODEPEND .\mdi.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/mdi/mdi.dsp b/samples/mdi/mdi.dsp
index 1cba09c7351ad416bfeb801cd7cb5e44154e2d39..959aea73848a81031541906665e6a4a3011efbdd 100644 (file)
--- a/samples/mdi/mdi.dsp
+++ b/samples/mdi/mdi.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\mdi"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\mdi"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\mdi"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\mdi"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj
index 71286774e79a1f149e3e70724c13aebaa5a16f4b..2277115c28f6b265d1361b70f9bb91ec2c63ce5f 100644 (file)
--- a/samples/mdi/mdi_vc7.vcproj
+++ b/samples/mdi/mdi_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\mdi.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\mdi.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\mdi.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\mdi.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/mdi/mdi_vc8.vcproj b/samples/mdi/mdi_vc8.vcproj
index bbb0a93d24142024a1d8d1a1efad36663e942d69..b09a042eee6e254a5f46ef1875a8e4745a29e0ad 100644 (file)
--- a/samples/mdi/mdi_vc8.vcproj
+++ b/samples/mdi/mdi_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/mdi/mdi_vc9.vcproj b/samples/mdi/mdi_vc9.vcproj
index 786a7a5700be99af69c88ffdd0a2ee48e7247ddb..b89868bdeb12533e0081eb90129cba25073ddb50 100644 (file)
--- a/samples/mdi/mdi_vc9.vcproj
+++ b/samples/mdi/mdi_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mdi.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mdi.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 2eab5117b09441777d03c92bcc571298c1bae1a7..9a07713f0c8f556201887490b5345919f19c01f4 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc
index 29f49d17fde0ecdb34626745ca4ab4360089ff4c..eb9257fb23a8051bf052f96da6879b82ce355a3e 100644 (file)
--- a/samples/mediaplayer/makefile.bcc
+++ b/samples/mediaplayer/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEDIAPLAYER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-MEDIAPLAYER_OBJECTS =  \\r
-       $(OBJS)\mediaplayer_mediaplayer.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"\r
-__WXLIB_MEDIA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mediaplayer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe\r
-       -if exist $(OBJS)\mediaplayer.tds del $(OBJS)\mediaplayer.tds\r
-       -if exist $(OBJS)\mediaplayer.ilc del $(OBJS)\mediaplayer.ilc\r
-       -if exist $(OBJS)\mediaplayer.ild del $(OBJS)\mediaplayer.ild\r
-       -if exist $(OBJS)\mediaplayer.ilf del $(OBJS)\mediaplayer.ilf\r
-       -if exist $(OBJS)\mediaplayer.ils del $(OBJS)\mediaplayer.ils\r
-\r
-$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS)  $(OBJS)\mediaplayer_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(MEDIAPLAYER_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mediaplayer_sample.res\r
-|\r
-\r
-$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp\r
-       $(CXX) -q -c -P -o$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEDIAPLAYER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+MEDIAPLAYER_OBJECTS =  \
+       $(OBJS)\mediaplayer_mediaplayer.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mediaplayer.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
+       -if exist $(OBJS)\mediaplayer.tds del $(OBJS)\mediaplayer.tds
+       -if exist $(OBJS)\mediaplayer.ilc del $(OBJS)\mediaplayer.ilc
+       -if exist $(OBJS)\mediaplayer.ild del $(OBJS)\mediaplayer.ild
+       -if exist $(OBJS)\mediaplayer.ilf del $(OBJS)\mediaplayer.ilf
+       -if exist $(OBJS)\mediaplayer.ils del $(OBJS)\mediaplayer.ils
+
+$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS)  $(OBJS)\mediaplayer_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(MEDIAPLAYER_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mediaplayer_sample.res
+|
+
+$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp
+       $(CXX) -q -c -P -o$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp
+

diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index 590a32d5a51326522b6ed712c4dc072b164fa7ac..c56489e817c1b5d84a22ce179ef5f49ca7bce8b0 100644 (file)
--- a/samples/mediaplayer/makefile.gcc
+++ b/samples/mediaplayer/makefile.gcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-MEDIAPLAYER_OBJECTS =  \\r
-       $(OBJS)\mediaplayer_sample_rc.o \\r
-       $(OBJS)\mediaplayer_mediaplayer.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-ifeq ($(USE_MEDIA),1)\r
-__WXLIB_MEDIA_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media\r
-endif\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mediaplayer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe\r
-\r
-$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample_rc.o\r
-       $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\mediaplayer_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\mediaplayer_mediaplayer.o: ./mediaplayer.cpp\r
-       $(CXX) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+MEDIAPLAYER_OBJECTS =  \
+       $(OBJS)\mediaplayer_sample_rc.o \
+       $(OBJS)\mediaplayer_mediaplayer.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_MEDIA),1)
+__WXLIB_MEDIA_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mediaplayer.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
+
+$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample_rc.o
+       $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\mediaplayer_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\mediaplayer_mediaplayer.o: ./mediaplayer.cpp
+       $(CXX) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx
index 01fb3514bdfcd20d408ed02b89ac0270ecae5be0..cf54f372e0f5c2067c66cf65a9fae1d7081b6204 100644 (file)
--- a/samples/mediaplayer/makefile.unx
+++ b/samples/mediaplayer/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index 1091ff4dd1366b01a499c8211cfb892482e636b8..26aaa30f93b558202ae68af081747f52c0e0775f 100644 (file)
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEDIAPLAYER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MEDIAPLAYER_OBJECTS =  \\r
-       $(OBJS)\mediaplayer_sample.res \\r
-       $(OBJS)\mediaplayer_mediaplayer.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"\r
-__WXLIB_MEDIA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mediaplayer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe\r
-       -if exist $(OBJS)\mediaplayer.ilk del $(OBJS)\mediaplayer.ilk\r
-       -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb\r
-\r
-$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MEDIAPLAYER_OBJECTS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEDIAPLAYER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MEDIAPLAYER_OBJECTS =  \
+       $(OBJS)\mediaplayer_mediaplayer.obj
+MEDIAPLAYER_RESOURCES =  \
+       $(OBJS)\mediaplayer_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mediaplayer.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
+       -if exist $(OBJS)\mediaplayer.ilk del $(OBJS)\mediaplayer.ilk
+       -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb
+
+$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MEDIAPLAYER_OBJECTS) $(MEDIAPLAYER_RESOURCES)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp
+

diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index 6f737fb85da2bf32abdf71f2626b9c573cc37d27..1cf7a1aa64b84f6d852e22be111f9afc8db18d97 100644 (file)
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/makefile.wat
@@ -1,267 +1,267 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_MEDIA_p =\r
-!ifeq MONOLITHIC 0\r
-!ifeq USE_MEDIA 1\r
-__WXLIB_MEDIA_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-MEDIAPLAYER_OBJECTS =  &\r
-       $(OBJS)\mediaplayer_mediaplayer.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\mediaplayer.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe\r
-\r
-$(OBJS)\mediaplayer.exe :  $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res\r
-       @%create $(OBJS)\mediaplayer.lbc\r
-       @%append $(OBJS)\mediaplayer.lbc option quiet\r
-       @%append $(OBJS)\mediaplayer.lbc name $^@\r
-       @%append $(OBJS)\mediaplayer.lbc option caseexact\r
-       @%append $(OBJS)\mediaplayer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i\r
-       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mediaplayer.lbc library %i\r
-       @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res\r
-       @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i\r
-       wlink @$(OBJS)\mediaplayer.lbc\r
-\r
-$(OBJS)\mediaplayer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\mediaplayer_mediaplayer.obj :  .AUTODEPEND .\mediaplayer.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_MEDIA_p =
+!ifeq MONOLITHIC 0
+!ifeq USE_MEDIA 1
+__WXLIB_MEDIA_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+MEDIAPLAYER_OBJECTS =  &
+       $(OBJS)\mediaplayer_mediaplayer.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\mediaplayer.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
+
+$(OBJS)\mediaplayer.exe :  $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
+       @%create $(OBJS)\mediaplayer.lbc
+       @%append $(OBJS)\mediaplayer.lbc option quiet
+       @%append $(OBJS)\mediaplayer.lbc name $^@
+       @%append $(OBJS)\mediaplayer.lbc option caseexact
+       @%append $(OBJS)\mediaplayer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i
+       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mediaplayer.lbc library %i
+       @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res
+       @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i
+       wlink @$(OBJS)\mediaplayer.lbc
+
+$(OBJS)\mediaplayer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\mediaplayer_mediaplayer.obj :  .AUTODEPEND .\mediaplayer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $<
+

diff --git a/samples/mediaplayer/mediaplayer.dsp b/samples/mediaplayer/mediaplayer.dsp
index af56903d54163000987db56ca8e9f9f2cef7b432..a12401418ba0f472ebd0381861bfc7efb0fc7b9e 100644 (file)
--- a/samples/mediaplayer/mediaplayer.dsp
+++ b/samples/mediaplayer/mediaplayer.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\mediaplayer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\mediaplayer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\mediaplayer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\mediaplayer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/mediaplayer/mediaplayer_vc7.vcproj b/samples/mediaplayer/mediaplayer_vc7.vcproj
index 0204f1535b7489614534709db2662ee4889aabde..44f0844e9cba2162c8642dc864cecca53bce122b 100644 (file)
--- a/samples/mediaplayer/mediaplayer_vc7.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\mediaplayer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/mediaplayer/mediaplayer_vc8.vcproj b/samples/mediaplayer/mediaplayer_vc8.vcproj
index c586f64118a2168bc09ad95a773bbae9ad3dbfe3..344f8c7f1c97e8512e52b18c7879b5e57c97f5fd 100644 (file)
--- a/samples/mediaplayer/mediaplayer_vc8.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/mediaplayer/mediaplayer_vc9.vcproj b/samples/mediaplayer/mediaplayer_vc9.vcproj
index 74ab19c3f8e8951c4c172bb1790050964c27c103..ec741e674755919ddef201ab600199f29831ab05 100644 (file)
--- a/samples/mediaplayer/mediaplayer_vc9.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mediaplayer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 2a85c6586ad8509b4b0cca907324c2055867d633..96624038def8edf3337191ae7f6868a2faa0e2d9 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index 5e3befd00ca87dbe72afeaf190e931617f21d267..6fe130cf689d5dacc1a774913b866d42c9de7b75 100644 (file)
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEMCHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-MEMCHECK_OBJECTS =  \\r
-       $(OBJS)\memcheck_memcheck.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\memcheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
-       -if exist $(OBJS)\memcheck.tds del $(OBJS)\memcheck.tds\r
-       -if exist $(OBJS)\memcheck.ilc del $(OBJS)\memcheck.ilc\r
-       -if exist $(OBJS)\memcheck.ild del $(OBJS)\memcheck.ild\r
-       -if exist $(OBJS)\memcheck.ilf del $(OBJS)\memcheck.ilf\r
-       -if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils\r
-\r
-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS)  $(OBJS)\memcheck_memcheck.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_memcheck.res\r
-|\r
-\r
-$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp\r
-       $(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
-\r
-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\memcheck.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEMCHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+MEMCHECK_OBJECTS =  \
+       $(OBJS)\memcheck_memcheck.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\memcheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
+       -if exist $(OBJS)\memcheck.tds del $(OBJS)\memcheck.tds
+       -if exist $(OBJS)\memcheck.ilc del $(OBJS)\memcheck.ilc
+       -if exist $(OBJS)\memcheck.ild del $(OBJS)\memcheck.ild
+       -if exist $(OBJS)\memcheck.ilf del $(OBJS)\memcheck.ilf
+       -if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils
+
+$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS)  $(OBJS)\memcheck_memcheck.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_memcheck.res
+|
+
+$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp
+       $(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp
+
+$(OBJS)\memcheck_memcheck.res: .\memcheck.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\memcheck.rc
+

diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index bd06a03a2a24a16008b07870f09b545d5c2d88cc..55ad9cd5d30db2c8378cb84336c63de0f8845986 100644 (file)
--- a/samples/memcheck/makefile.gcc
+++ b/samples/memcheck/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEMCHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-MEMCHECK_OBJECTS =  \\r
-       $(OBJS)\memcheck_memcheck.o \\r
-       $(OBJS)\memcheck_memcheck_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\memcheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
-\r
-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o\r
-       $(CXX) -o $@ $(MEMCHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\memcheck_memcheck.o: ./memcheck.cpp\r
-       $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\memcheck_memcheck_rc.o: ./memcheck.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEMCHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+MEMCHECK_OBJECTS =  \
+       $(OBJS)\memcheck_memcheck.o \
+       $(OBJS)\memcheck_memcheck_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\memcheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
+
+$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o
+       $(CXX) -o $@ $(MEMCHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\memcheck_memcheck.o: ./memcheck.cpp
+       $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\memcheck_memcheck_rc.o: ./memcheck.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx
index afb91a51fd5d93ce564d3ef33c7e1cddd46ed8ae..181db3aafe958f7f50f106485da12487deca3599 100644 (file)
--- a/samples/memcheck/makefile.unx
+++ b/samples/memcheck/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index caf349ad264149acc43f4ff6fb3c569d722069f0..ed738e80d44558e0cb313f14edfdc791caf81bc2 100644 (file)
--- a/samples/memcheck/makefile.vc
+++ b/samples/memcheck/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MEMCHECK_OBJECTS =  \\r
-       $(OBJS)\memcheck_memcheck.obj \\r
-       $(OBJS)\memcheck_memcheck.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\memcheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
-       -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk\r
-       -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb\r
-\r
-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MEMCHECK_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
-\r
-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\memcheck.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MEMCHECK_OBJECTS =  \
+       $(OBJS)\memcheck_memcheck.obj
+MEMCHECK_RESOURCES =  \
+       $(OBJS)\memcheck_memcheck.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\memcheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
+       -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk
+       -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb
+
+$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MEMCHECK_OBJECTS) $(MEMCHECK_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp
+
+$(OBJS)\memcheck_memcheck.res: .\memcheck.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\memcheck.rc
+

diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 9e0c3709ed5fc2158b7a4ed6a25e8d8f330df3ef..f2ac528281dfe2ec555e30008d18193bd8fdf81a 100644 (file)
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-MEMCHECK_OBJECTS =  &\r
-       $(OBJS)\memcheck_memcheck.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\memcheck.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
-\r
-$(OBJS)\memcheck.exe :  $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res\r
-       @%create $(OBJS)\memcheck.lbc\r
-       @%append $(OBJS)\memcheck.lbc option quiet\r
-       @%append $(OBJS)\memcheck.lbc name $^@\r
-       @%append $(OBJS)\memcheck.lbc option caseexact\r
-       @%append $(OBJS)\memcheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\memcheck.lbc library %i\r
-       @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res\r
-       @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i\r
-       wlink @$(OBJS)\memcheck.lbc\r
-\r
-$(OBJS)\memcheck_memcheck.obj :  .AUTODEPEND .\memcheck.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $<\r
-\r
-$(OBJS)\memcheck_memcheck.res :  .AUTODEPEND .\memcheck.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+MEMCHECK_OBJECTS =  &
+       $(OBJS)\memcheck_memcheck.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\memcheck.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
+
+$(OBJS)\memcheck.exe :  $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
+       @%create $(OBJS)\memcheck.lbc
+       @%append $(OBJS)\memcheck.lbc option quiet
+       @%append $(OBJS)\memcheck.lbc name $^@
+       @%append $(OBJS)\memcheck.lbc option caseexact
+       @%append $(OBJS)\memcheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\memcheck.lbc library %i
+       @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res
+       @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i
+       wlink @$(OBJS)\memcheck.lbc
+
+$(OBJS)\memcheck_memcheck.obj :  .AUTODEPEND .\memcheck.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $<
+
+$(OBJS)\memcheck_memcheck.res :  .AUTODEPEND .\memcheck.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/memcheck/memcheck.dsp b/samples/memcheck/memcheck.dsp
index 86fb0d00ff125ade349c667447a3ba88b487dc83..baed90b5779279af0b53287beb27098847d18cc4 100644 (file)
--- a/samples/memcheck/memcheck.dsp
+++ b/samples/memcheck/memcheck.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\memcheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\memcheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\memcheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\memcheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj
index 7eca7862f637edcb206538cd00ac90d32b6b93fc..06afd212694f939fe212645630552a1f258bff03 100644 (file)
--- a/samples/memcheck/memcheck_vc7.vcproj
+++ b/samples/memcheck/memcheck_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\memcheck.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\memcheck.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\memcheck.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj
index 69bdfc0adde7128ef5850d09a3b228ac36d283b6..43c93f74387f720ec2425c508094bb9aef4be354 100644 (file)
--- a/samples/memcheck/memcheck_vc8.vcproj
+++ b/samples/memcheck/memcheck_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/memcheck/memcheck_vc9.vcproj b/samples/memcheck/memcheck_vc9.vcproj
index 1a1bf486cff96b862e2670155d02f594b333e25d..510e2834182b7335bc1b95ed8548d068eda19447 100644 (file)
--- a/samples/memcheck/memcheck_vc9.vcproj
+++ b/samples/memcheck/memcheck_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\memcheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index b5ce1f620aadb66d21bd8c6bb3778ea6b3313c4c..409ab3fded7124ee8bb00069216d3a28a6f83802 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index be7ca743ad686f08e79abff1d8026db2d80811b6..b18691b2ea92b1b358c6928620db3376183ea681 100644 (file)
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MENU_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-MENU_OBJECTS =  \\r
-       $(OBJS)\menu_menu.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\menu.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
-       -if exist $(OBJS)\menu.tds del $(OBJS)\menu.tds\r
-       -if exist $(OBJS)\menu.ilc del $(OBJS)\menu.ilc\r
-       -if exist $(OBJS)\menu.ild del $(OBJS)\menu.ild\r
-       -if exist $(OBJS)\menu.ilf del $(OBJS)\menu.ilf\r
-       -if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils\r
-\r
-$(OBJS)\menu.exe: $(MENU_OBJECTS)  $(OBJS)\menu_menu.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_menu.res\r
-|\r
-\r
-$(OBJS)\menu_menu.obj: .\menu.cpp\r
-       $(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) .\menu.cpp\r
-\r
-$(OBJS)\menu_menu.res: .\menu.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\menu.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MENU_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+MENU_OBJECTS =  \
+       $(OBJS)\menu_menu.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\menu.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
+       -if exist $(OBJS)\menu.tds del $(OBJS)\menu.tds
+       -if exist $(OBJS)\menu.ilc del $(OBJS)\menu.ilc
+       -if exist $(OBJS)\menu.ild del $(OBJS)\menu.ild
+       -if exist $(OBJS)\menu.ilf del $(OBJS)\menu.ilf
+       -if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils
+
+$(OBJS)\menu.exe: $(MENU_OBJECTS)  $(OBJS)\menu_menu.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_menu.res
+|
+
+$(OBJS)\menu_menu.obj: .\menu.cpp
+       $(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) .\menu.cpp
+
+$(OBJS)\menu_menu.res: .\menu.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\menu.rc
+

diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 0cd6104c17c55f6b03a86a080cf5b071e2a85fb7..a400f2d65b21800b38c601c4009d28351c1de9f1 100644 (file)
--- a/samples/menu/makefile.gcc
+++ b/samples/menu/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MENU_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MENU_OBJECTS =  \\r
-       $(OBJS)\menu_menu.o \\r
-       $(OBJS)\menu_menu_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\menu.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
-\r
-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o\r
-       $(CXX) -o $@ $(MENU_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\menu_menu.o: ./menu.cpp\r
-       $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\menu_menu_rc.o: ./menu.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MENU_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+MENU_OBJECTS =  \
+       $(OBJS)\menu_menu.o \
+       $(OBJS)\menu_menu_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\menu.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
+
+$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o
+       $(CXX) -o $@ $(MENU_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\menu_menu.o: ./menu.cpp
+       $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\menu_menu_rc.o: ./menu.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx
index 25d807df0d3f64feb287a395bd069884cec542d6..ad32bf6a9d2544d3aa90c0e100f4c2f6ba4a55f1 100644 (file)
--- a/samples/menu/makefile.unx
+++ b/samples/menu/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index f3d89a29017576ec96685ab88ca570c4a8f6b524..b4c7835d3aa29cd9616b3aedd06330805ab09f01 100644 (file)
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MENU_OBJECTS =  \\r
-       $(OBJS)\menu_menu.obj \\r
-       $(OBJS)\menu_menu.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\menu.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
-       -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk\r
-       -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb\r
-\r
-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MENU_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\menu_menu.obj: .\menu.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp\r
-\r
-$(OBJS)\menu_menu.res: .\menu.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\menu.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MENU_OBJECTS =  \
+       $(OBJS)\menu_menu.obj
+MENU_RESOURCES =  \
+       $(OBJS)\menu_menu.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\menu.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
+       -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk
+       -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb
+
+$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MENU_OBJECTS) $(MENU_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\menu_menu.obj: .\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp
+
+$(OBJS)\menu_menu.res: .\menu.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\menu.rc
+

diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index eadce7b85a9f8107697c7450a1fba741dae54049..3b2bde64e098a09c946a0d782118d5bda96fad14 100644 (file)
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-MENU_OBJECTS =  &\r
-       $(OBJS)\menu_menu.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\menu.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
-\r
-$(OBJS)\menu.exe :  $(MENU_OBJECTS) $(OBJS)\menu_menu.res\r
-       @%create $(OBJS)\menu.lbc\r
-       @%append $(OBJS)\menu.lbc option quiet\r
-       @%append $(OBJS)\menu.lbc name $^@\r
-       @%append $(OBJS)\menu.lbc option caseexact\r
-       @%append $(OBJS)\menu.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\menu.lbc library %i\r
-       @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res\r
-       @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i\r
-       wlink @$(OBJS)\menu.lbc\r
-\r
-$(OBJS)\menu_menu.obj :  .AUTODEPEND .\menu.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $<\r
-\r
-$(OBJS)\menu_menu.res :  .AUTODEPEND .\menu.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+MENU_OBJECTS =  &
+       $(OBJS)\menu_menu.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\menu.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
+
+$(OBJS)\menu.exe :  $(MENU_OBJECTS) $(OBJS)\menu_menu.res
+       @%create $(OBJS)\menu.lbc
+       @%append $(OBJS)\menu.lbc option quiet
+       @%append $(OBJS)\menu.lbc name $^@
+       @%append $(OBJS)\menu.lbc option caseexact
+       @%append $(OBJS)\menu.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\menu.lbc library %i
+       @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res
+       @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i
+       wlink @$(OBJS)\menu.lbc
+
+$(OBJS)\menu_menu.obj :  .AUTODEPEND .\menu.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $<
+
+$(OBJS)\menu_menu.res :  .AUTODEPEND .\menu.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/menu/menu.dsp b/samples/menu/menu.dsp
index f7ced8db89e3ee004a19128809b2f4cf40e64993..3d6463c58e938b6d9baf0c3b9af3b773c3d1f89f 100644 (file)
--- a/samples/menu/menu.dsp
+++ b/samples/menu/menu.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\menu"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\menu"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\menu"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\menu"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj
index af53d6b505a0632627d57c60bbecd6b559af4d5c..d7f919e9ee8f50c607fc3c29f3804062d0210782 100644 (file)
--- a/samples/menu/menu_vc7.vcproj
+++ b/samples/menu/menu_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\menu.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\menu.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\menu.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\menu.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj
index 9059fb059598d962ff5272e70020a7bc6832cbbc..e667d1bcf272b7ce6d57bc98e763aa4d0ea58eba 100644 (file)
--- a/samples/menu/menu_vc8.vcproj
+++ b/samples/menu/menu_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/menu/menu_vc9.vcproj b/samples/menu/menu_vc9.vcproj
index 924df40edddf564712d663ef6e60b2822095ccdf..18ce7b208a09dd6a5490219fc41281ca67d187b5 100644 (file)
--- a/samples/menu/menu_vc9.vcproj
+++ b/samples/menu/menu_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\menu.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\menu.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc
index da06a1437d70deb70ca98e8d081a2b9f04c4117d..6167de5666caf4c6d34738f4a2a06b03aa5d96a3 100644 (file)
--- a/samples/mfc/makefile.vc
+++ b/samples/mfc/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MFCTEST_OBJECTS =  \\r
-       $(OBJS)\mfctest_mfctest.obj \\r
-       $(OBJS)\mfctest_mfctest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\mfctest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe\r
-       -if exist $(OBJS)\mfctest.ilk del $(OBJS)\mfctest.ilk\r
-       -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb\r
-\r
-$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MFCTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\mfctest_mfctest.obj: .\mfctest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MFCTEST_CXXFLAGS) .\mfctest.cpp\r
-\r
-$(OBJS)\mfctest_mfctest.res: .\mfctest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mfctest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MFCTEST_OBJECTS =  \
+       $(OBJS)\mfctest_mfctest.obj
+MFCTEST_RESOURCES =  \
+       $(OBJS)\mfctest_mfctest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\mfctest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe
+       -if exist $(OBJS)\mfctest.ilk del $(OBJS)\mfctest.ilk
+       -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb
+
+$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MFCTEST_OBJECTS) $(MFCTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\mfctest_mfctest.obj: .\mfctest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MFCTEST_CXXFLAGS) .\mfctest.cpp
+
+$(OBJS)\mfctest_mfctest.res: .\mfctest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mfctest.rc
+

diff --git a/samples/mfc/mfc.dsp b/samples/mfc/mfc.dsp
index 53b98e4632f0656492036fdcb95ce108183e6e32..426c08c808f84c1a1c42f4ddf143bbc711517b66 100644 (file)
--- a/samples/mfc/mfc.dsp
+++ b/samples/mfc/mfc.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\mfctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\mfctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\mfctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\mfctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/mfc/mfc_vc7.vcproj b/samples/mfc/mfc_vc7.vcproj
index c8a61311a1fcd76b2b66ea1b9933cb5a95d6db96..8006f284df6c65c8230429287dfe02eb0a32aa01 100644 (file)
--- a/samples/mfc/mfc_vc7.vcproj
+++ b/samples/mfc/mfc_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\mfctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\mfctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\mfctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/mfc/mfc_vc8.vcproj b/samples/mfc/mfc_vc8.vcproj
index 4040030b319ea3f93c9b249cc245c8acfa4b7cea..d8aa6cace03b3d518b54ee353ef644df59a4fbfd 100644 (file)
--- a/samples/mfc/mfc_vc8.vcproj
+++ b/samples/mfc/mfc_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/mfc/mfc_vc9.vcproj b/samples/mfc/mfc_vc9.vcproj
index 9aef7154e706deedcd9c94454edaec356d87e2cc..73d5efa37dd17f6f3ff0384efe487fcd14667667 100644 (file)
--- a/samples/mfc/mfc_vc9.vcproj
+++ b/samples/mfc/mfc_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\mfctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 815019b641647d7ee113a6fde52470e381da1dfa..2866d1279d3ed0e5bdcd002c6fbee892e61c6b40 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
index 1fb144246083d6d89f3355f2d65dbdfd0cad50af..cd4b762dab1994c4ba020744133d5bc3b9152b84 100644 (file)
--- a/samples/minimal/makefile.bcc
+++ b/samples/minimal/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MINIMAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-MINIMAL_OBJECTS =  \\r
-       $(OBJS)\minimal_minimal.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\minimal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe\r
-       -if exist $(OBJS)\minimal.tds del $(OBJS)\minimal.tds\r
-       -if exist $(OBJS)\minimal.ilc del $(OBJS)\minimal.ilc\r
-       -if exist $(OBJS)\minimal.ild del $(OBJS)\minimal.ild\r
-       -if exist $(OBJS)\minimal.ilf del $(OBJS)\minimal.ilf\r
-       -if exist $(OBJS)\minimal.ils del $(OBJS)\minimal.ils\r
-\r
-$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS)  $(OBJS)\minimal_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(MINIMAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\minimal_sample.res\r
-|\r
-\r
-$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\minimal_minimal.obj: .\minimal.cpp\r
-       $(CXX) -q -c -P -o$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MINIMAL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+MINIMAL_OBJECTS =  \
+       $(OBJS)\minimal_minimal.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\minimal.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
+       -if exist $(OBJS)\minimal.tds del $(OBJS)\minimal.tds
+       -if exist $(OBJS)\minimal.ilc del $(OBJS)\minimal.ilc
+       -if exist $(OBJS)\minimal.ild del $(OBJS)\minimal.ild
+       -if exist $(OBJS)\minimal.ilf del $(OBJS)\minimal.ilf
+       -if exist $(OBJS)\minimal.ils del $(OBJS)\minimal.ils
+
+$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS)  $(OBJS)\minimal_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(MINIMAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\minimal_sample.res
+|
+
+$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\minimal_minimal.obj: .\minimal.cpp
+       $(CXX) -q -c -P -o$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp
+

diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc
index ada43b1d8c2e3e779ac1d2c5de9a8978da9e3053..4b6cade16f7e37298ea4af19aea558d6917b2e3c 100644 (file)
--- a/samples/minimal/makefile.gcc
+++ b/samples/minimal/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MINIMAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-MINIMAL_OBJECTS =  \\r
-       $(OBJS)\minimal_sample_rc.o \\r
-       $(OBJS)\minimal_minimal.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\minimal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe\r
-\r
-$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample_rc.o\r
-       $(CXX) -o $@ $(MINIMAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\minimal_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\minimal_minimal.o: ./minimal.cpp\r
-       $(CXX) -c -o $@ $(MINIMAL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MINIMAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+MINIMAL_OBJECTS =  \
+       $(OBJS)\minimal_sample_rc.o \
+       $(OBJS)\minimal_minimal.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\minimal.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
+
+$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample_rc.o
+       $(CXX) -o $@ $(MINIMAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\minimal_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\minimal_minimal.o: ./minimal.cpp
+       $(CXX) -c -o $@ $(MINIMAL_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
index 49302f9741046b48156b549b6e9eb8461c91cbf9..f5c52ddb7de2bd2f3c8d32fe73d2dc6c705837fe 100644 (file)
--- a/samples/minimal/makefile.unx
+++ b/samples/minimal/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 6e65673c3e16fe8be3c1b47799a0303bcace602b..44826af7979f0d68a9a87606673e08a7541599a1 100644 (file)
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-MINIMAL_OBJECTS =  \\r
-       $(OBJS)\minimal_sample.res \\r
-       $(OBJS)\minimal_minimal.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\minimal.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe\r
-       -if exist $(OBJS)\minimal.ilk del $(OBJS)\minimal.ilk\r
-       -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb\r
-\r
-$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(MINIMAL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\minimal_minimal.obj: .\minimal.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+MINIMAL_OBJECTS =  \
+       $(OBJS)\minimal_minimal.obj
+MINIMAL_RESOURCES =  \
+       $(OBJS)\minimal_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\minimal.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
+       -if exist $(OBJS)\minimal.ilk del $(OBJS)\minimal.ilk
+       -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb
+
+$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(MINIMAL_OBJECTS) $(MINIMAL_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\minimal_minimal.obj: .\minimal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp
+

diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index 63af18ef1513cd7667f82ca079c3cd9474dcaaa9..f45899c248566370e2dc263be103d8399d72d828 100644 (file)
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-MINIMAL_OBJECTS =  &\r
-       $(OBJS)\minimal_minimal.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\minimal.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe\r
-\r
-$(OBJS)\minimal.exe :  $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res\r
-       @%create $(OBJS)\minimal.lbc\r
-       @%append $(OBJS)\minimal.lbc option quiet\r
-       @%append $(OBJS)\minimal.lbc name $^@\r
-       @%append $(OBJS)\minimal.lbc option caseexact\r
-       @%append $(OBJS)\minimal.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\minimal.lbc library %i\r
-       @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res\r
-       @for %i in () do @%append $(OBJS)\minimal.lbc option stack=%i\r
-       wlink @$(OBJS)\minimal.lbc\r
-\r
-$(OBJS)\minimal_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\minimal_minimal.obj :  .AUTODEPEND .\minimal.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+MINIMAL_OBJECTS =  &
+       $(OBJS)\minimal_minimal.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\minimal.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
+
+$(OBJS)\minimal.exe :  $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res
+       @%create $(OBJS)\minimal.lbc
+       @%append $(OBJS)\minimal.lbc option quiet
+       @%append $(OBJS)\minimal.lbc name $^@
+       @%append $(OBJS)\minimal.lbc option caseexact
+       @%append $(OBJS)\minimal.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\minimal.lbc library %i
+       @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res
+       @for %i in () do @%append $(OBJS)\minimal.lbc option stack=%i
+       wlink @$(OBJS)\minimal.lbc
+
+$(OBJS)\minimal_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\minimal_minimal.obj :  .AUTODEPEND .\minimal.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $<
+

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 80bf766199342ddeeae4e3a38c7632b02698d3ab..d21c2524f3efb8b6532ea19c5f9a8422716909ef 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -68,6 +68,22 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
+    void OnPaint(wxPaintEvent&)
+    {
+        wxPaintDC dc(this);
+
+        wxFont font = GetFont();
+
+        for ( int size = 10; size < 20; size++ )
+        {
+            font.SetPixelSize(wxSize(0, size));
+            dc.SetFont(font);
+            dc.DrawText(wxString::Format("%dpx The quick brown fox jumps over the lazy dog.", size),
+                        10, 10 + (size - 10)*20);
+        }
+    }
+
+
 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
@@ -99,6 +115,7 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
+    EVT_PAINT(MyFrame::OnPaint)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create

diff --git a/samples/minimal/minimal.dsp b/samples/minimal/minimal.dsp
index c919626bf252eaf1deb9b58e07c5c2e01886248d..08630b9340770c08f17bf5074c9e5b3951d7ea44 100644 (file)
--- a/samples/minimal/minimal.dsp
+++ b/samples/minimal/minimal.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\minimal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\minimal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\minimal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\minimal"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj
index b8d39d1f1e8d459ac789be8af815f760da5142fc..512e9118758baa7781809cec1520579dc80fc992 100644 (file)
--- a/samples/minimal/minimal_vc7.vcproj
+++ b/samples/minimal/minimal_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\minimal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\minimal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\minimal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\minimal.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/minimal/minimal_vc8.vcproj b/samples/minimal/minimal_vc8.vcproj
index 44f82aa1c9798618be91e16d36c63e4d2b77d12b..89b6255c4fe4a20d2e23a4b0ce3bdabac84f6df7 100644 (file)
--- a/samples/minimal/minimal_vc8.vcproj
+++ b/samples/minimal/minimal_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/minimal/minimal_vc9.vcproj b/samples/minimal/minimal_vc9.vcproj
index 9a8b25bab1fb526d456f7873554186de5bd26ec2..8cfb222e0e1cc765b7ddb5a260c35fa3e9176611 100644 (file)
--- a/samples/minimal/minimal_vc9.vcproj
+++ b/samples/minimal/minimal_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\minimal.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\minimal.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index b09ba942f48ef1935c901a91c28633c3480fb2b4..86b435455bd2de18110fcc2bbbf4de1c4e2b0336 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc
index 9532356d99a87cd75f482bd8fa966a7607392dd2..eaa5151f070dff233e7d93bf0734b160cab2f73e 100644 (file)
--- a/samples/nativdlg/makefile.bcc
+++ b/samples/nativdlg/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NATIVDLG_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-NATIVDLG_OBJECTS =  \\r
-       $(OBJS)\nativdlg_nativdlg.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nativdlg.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe\r
-       -if exist $(OBJS)\nativdlg.tds del $(OBJS)\nativdlg.tds\r
-       -if exist $(OBJS)\nativdlg.ilc del $(OBJS)\nativdlg.ilc\r
-       -if exist $(OBJS)\nativdlg.ild del $(OBJS)\nativdlg.ild\r
-       -if exist $(OBJS)\nativdlg.ilf del $(OBJS)\nativdlg.ilf\r
-       -if exist $(OBJS)\nativdlg.ils del $(OBJS)\nativdlg.ils\r
-\r
-$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS)  $(OBJS)\nativdlg_nativdlg.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(NATIVDLG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nativdlg_nativdlg.res\r
-|\r
-\r
-$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp\r
-       $(CXX) -q -c -P -o$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp\r
-\r
-$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nativdlg.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NATIVDLG_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+NATIVDLG_OBJECTS =  \
+       $(OBJS)\nativdlg_nativdlg.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nativdlg.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
+       -if exist $(OBJS)\nativdlg.tds del $(OBJS)\nativdlg.tds
+       -if exist $(OBJS)\nativdlg.ilc del $(OBJS)\nativdlg.ilc
+       -if exist $(OBJS)\nativdlg.ild del $(OBJS)\nativdlg.ild
+       -if exist $(OBJS)\nativdlg.ilf del $(OBJS)\nativdlg.ilf
+       -if exist $(OBJS)\nativdlg.ils del $(OBJS)\nativdlg.ils
+
+$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS)  $(OBJS)\nativdlg_nativdlg.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(NATIVDLG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nativdlg_nativdlg.res
+|
+
+$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp
+       $(CXX) -q -c -P -o$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp
+
+$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nativdlg.rc
+

diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc
index 061688b4526c1aad4772b1837eda72ce4e64ebae..fd1f7df1482f620c0229381fb55d1ed0456c7b7d 100644 (file)
--- a/samples/nativdlg/makefile.gcc
+++ b/samples/nativdlg/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NATIVDLG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-NATIVDLG_OBJECTS =  \\r
-       $(OBJS)\nativdlg_nativdlg.o \\r
-       $(OBJS)\nativdlg_nativdlg_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nativdlg.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe\r
-\r
-$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o\r
-       $(CXX) -o $@ $(NATIVDLG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp\r
-       $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\nativdlg_nativdlg_rc.o: ./nativdlg.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NATIVDLG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+NATIVDLG_OBJECTS =  \
+       $(OBJS)\nativdlg_nativdlg.o \
+       $(OBJS)\nativdlg_nativdlg_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nativdlg.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
+
+$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o
+       $(CXX) -o $@ $(NATIVDLG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp
+       $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\nativdlg_nativdlg_rc.o: ./nativdlg.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx
index 48479c1cb998be2e1899e7cfbd622c5c4c3db863..b7afa1cfd5e683fe186884c78260ccb865a73e01 100644 (file)
--- a/samples/nativdlg/makefile.unx
+++ b/samples/nativdlg/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc
index 4122eac840e2aacc1f864da7632b54ce1cd9fa52..4d1fde35859f29c8c39e69ffc025e7bc8412e250 100644 (file)
--- a/samples/nativdlg/makefile.vc
+++ b/samples/nativdlg/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-NATIVDLG_OBJECTS =  \\r
-       $(OBJS)\nativdlg_nativdlg.obj \\r
-       $(OBJS)\nativdlg_nativdlg.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\nativdlg.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe\r
-       -if exist $(OBJS)\nativdlg.ilk del $(OBJS)\nativdlg.ilk\r
-       -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb\r
-\r
-$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(NATIVDLG_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp\r
-\r
-$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nativdlg.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+NATIVDLG_OBJECTS =  \
+       $(OBJS)\nativdlg_nativdlg.obj
+NATIVDLG_RESOURCES =  \
+       $(OBJS)\nativdlg_nativdlg.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\nativdlg.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
+       -if exist $(OBJS)\nativdlg.ilk del $(OBJS)\nativdlg.ilk
+       -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb
+
+$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(NATIVDLG_OBJECTS) $(NATIVDLG_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp
+
+$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nativdlg.rc
+

diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat
index cd0208e95baa9f67615975d03e9a5cd6e27923ea..62dc41b9f1f4bd92c4f81a7c8bb8543dfc6121c8 100644 (file)
--- a/samples/nativdlg/makefile.wat
+++ b/samples/nativdlg/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-NATIVDLG_OBJECTS =  &\r
-       $(OBJS)\nativdlg_nativdlg.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\nativdlg.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe\r
-\r
-$(OBJS)\nativdlg.exe :  $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res\r
-       @%create $(OBJS)\nativdlg.lbc\r
-       @%append $(OBJS)\nativdlg.lbc option quiet\r
-       @%append $(OBJS)\nativdlg.lbc name $^@\r
-       @%append $(OBJS)\nativdlg.lbc option caseexact\r
-       @%append $(OBJS)\nativdlg.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nativdlg.lbc library %i\r
-       @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res\r
-       @for %i in () do @%append $(OBJS)\nativdlg.lbc option stack=%i\r
-       wlink @$(OBJS)\nativdlg.lbc\r
-\r
-$(OBJS)\nativdlg_nativdlg.obj :  .AUTODEPEND .\nativdlg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $<\r
-\r
-$(OBJS)\nativdlg_nativdlg.res :  .AUTODEPEND .\nativdlg.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+NATIVDLG_OBJECTS =  &
+       $(OBJS)\nativdlg_nativdlg.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\nativdlg.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
+
+$(OBJS)\nativdlg.exe :  $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res
+       @%create $(OBJS)\nativdlg.lbc
+       @%append $(OBJS)\nativdlg.lbc option quiet
+       @%append $(OBJS)\nativdlg.lbc name $^@
+       @%append $(OBJS)\nativdlg.lbc option caseexact
+       @%append $(OBJS)\nativdlg.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nativdlg.lbc library %i
+       @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res
+       @for %i in () do @%append $(OBJS)\nativdlg.lbc option stack=%i
+       wlink @$(OBJS)\nativdlg.lbc
+
+$(OBJS)\nativdlg_nativdlg.obj :  .AUTODEPEND .\nativdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $<
+
+$(OBJS)\nativdlg_nativdlg.res :  .AUTODEPEND .\nativdlg.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/nativdlg/nativdlg.dsp b/samples/nativdlg/nativdlg.dsp
index 4ffe35bf402fabb29ca8b60eca525fb8c90381a4..b2acf1855c3c9aa7e7f5b8fde38ca0f9b4d6f382 100644 (file)
--- a/samples/nativdlg/nativdlg.dsp
+++ b/samples/nativdlg/nativdlg.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\nativdlg"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\nativdlg"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\nativdlg"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\nativdlg"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj
index bf0479a50a932657dacfb90437e653d1c8a5de13..d55b1052cc72218bdab9a67ecc653ceb0fd26b16 100644 (file)
--- a/samples/nativdlg/nativdlg_vc7.vcproj
+++ b/samples/nativdlg/nativdlg_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\nativdlg.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\nativdlg.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/nativdlg/nativdlg_vc8.vcproj b/samples/nativdlg/nativdlg_vc8.vcproj
index 93fb184bb47a53a522800411380b72181b342303..6cf34777872235eb1079e056b92a9538dc0e8146 100644 (file)
--- a/samples/nativdlg/nativdlg_vc8.vcproj
+++ b/samples/nativdlg/nativdlg_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/nativdlg/nativdlg_vc9.vcproj b/samples/nativdlg/nativdlg_vc9.vcproj
index 3e4cbc2deac041b5222589530976567559dc075e..5954b559e6ea04cb30091edab98ed54447db483a 100644 (file)
--- a/samples/nativdlg/nativdlg_vc9.vcproj
+++ b/samples/nativdlg/nativdlg_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\nativdlg.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 9be6acf62058507d956c7bfdab8b70a1725a9007..159d400d6561df776afc1e6d60848214c307d69a 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index a98fef86fc5cef862fc45396b1186f61368c4924..c93ec23553a6bacb746689cb228d9487bc53882f 100644 (file)
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NOTEBOOK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-NOTEBOOK_OBJECTS =  \\r
-       $(OBJS)\notebook_notebook.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\notebook.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe\r
-       -if exist $(OBJS)\notebook.tds del $(OBJS)\notebook.tds\r
-       -if exist $(OBJS)\notebook.ilc del $(OBJS)\notebook.ilc\r
-       -if exist $(OBJS)\notebook.ild del $(OBJS)\notebook.ild\r
-       -if exist $(OBJS)\notebook.ilf del $(OBJS)\notebook.ilf\r
-       -if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils\r
-\r
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res\r
-|\r
-\r
-$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\notebook_notebook.obj: .\notebook.cpp\r
-       $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NOTEBOOK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+NOTEBOOK_OBJECTS =  \
+       $(OBJS)\notebook_notebook.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\notebook.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
+       -if exist $(OBJS)\notebook.tds del $(OBJS)\notebook.tds
+       -if exist $(OBJS)\notebook.ilc del $(OBJS)\notebook.ilc
+       -if exist $(OBJS)\notebook.ild del $(OBJS)\notebook.ild
+       -if exist $(OBJS)\notebook.ilf del $(OBJS)\notebook.ilf
+       -if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils
+
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res
+|
+
+$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\notebook_notebook.obj: .\notebook.cpp
+       $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp
+

diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index d131a86a65f3d7d40db4fc556309be5686adbf5d..805e24ad079d1f1716ad81f01e435bf86645b850 100644 (file)
--- a/samples/notebook/makefile.gcc
+++ b/samples/notebook/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NOTEBOOK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-NOTEBOOK_OBJECTS =  \\r
-       $(OBJS)\notebook_sample_rc.o \\r
-       $(OBJS)\notebook_notebook.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\notebook.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe\r
-\r
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o\r
-       $(CXX) -o $@ $(NOTEBOOK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\notebook_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\notebook_notebook.o: ./notebook.cpp\r
-       $(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NOTEBOOK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+NOTEBOOK_OBJECTS =  \
+       $(OBJS)\notebook_sample_rc.o \
+       $(OBJS)\notebook_notebook.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\notebook.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
+
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o
+       $(CXX) -o $@ $(NOTEBOOK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\notebook_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\notebook_notebook.o: ./notebook.cpp
+       $(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx
index 94e4f8e6448277289d5b812ffe3b29fda06127d9..8397de9b2109efa95da948e36024aba7c7779fb6 100644 (file)
--- a/samples/notebook/makefile.unx
+++ b/samples/notebook/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index be835a27eba18355fd00945c5fc7d3a027379173..2edf2ee83768840afab82d99b095cfcc0c29e640 100644 (file)
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-NOTEBOOK_OBJECTS =  \\r
-       $(OBJS)\notebook_sample.res \\r
-       $(OBJS)\notebook_notebook.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\notebook.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe\r
-       -if exist $(OBJS)\notebook.ilk del $(OBJS)\notebook.ilk\r
-       -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb\r
-\r
-$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(NOTEBOOK_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\notebook_notebook.obj: .\notebook.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+NOTEBOOK_OBJECTS =  \
+       $(OBJS)\notebook_notebook.obj
+NOTEBOOK_RESOURCES =  \
+       $(OBJS)\notebook_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\notebook.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
+       -if exist $(OBJS)\notebook.ilk del $(OBJS)\notebook.ilk
+       -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb
+
+$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(NOTEBOOK_OBJECTS) $(NOTEBOOK_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\notebook_notebook.obj: .\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp
+

diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat
index 3bcfe95e02aeece9993b84ab428df90d243022ae..acce868e8a8a3c18149c3ee816b8a36c376b663a 100644 (file)
--- a/samples/notebook/makefile.wat
+++ b/samples/notebook/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-NOTEBOOK_OBJECTS =  &\r
-       $(OBJS)\notebook_notebook.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\notebook.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe\r
-\r
-$(OBJS)\notebook.exe :  $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res\r
-       @%create $(OBJS)\notebook.lbc\r
-       @%append $(OBJS)\notebook.lbc option quiet\r
-       @%append $(OBJS)\notebook.lbc name $^@\r
-       @%append $(OBJS)\notebook.lbc option caseexact\r
-       @%append $(OBJS)\notebook.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\notebook.lbc library %i\r
-       @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res\r
-       @for %i in () do @%append $(OBJS)\notebook.lbc option stack=%i\r
-       wlink @$(OBJS)\notebook.lbc\r
-\r
-$(OBJS)\notebook_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\notebook_notebook.obj :  .AUTODEPEND .\notebook.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+NOTEBOOK_OBJECTS =  &
+       $(OBJS)\notebook_notebook.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\notebook.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
+
+$(OBJS)\notebook.exe :  $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res
+       @%create $(OBJS)\notebook.lbc
+       @%append $(OBJS)\notebook.lbc option quiet
+       @%append $(OBJS)\notebook.lbc name $^@
+       @%append $(OBJS)\notebook.lbc option caseexact
+       @%append $(OBJS)\notebook.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\notebook.lbc library %i
+       @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res
+       @for %i in () do @%append $(OBJS)\notebook.lbc option stack=%i
+       wlink @$(OBJS)\notebook.lbc
+
+$(OBJS)\notebook_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\notebook_notebook.obj :  .AUTODEPEND .\notebook.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $<
+

diff --git a/samples/notebook/notebook.dsp b/samples/notebook/notebook.dsp
index 6061a581281b7f9f67297de51d390725b7f36af7..de5aee07477f67b80eec88ce6ee529748cdbec3d 100644 (file)
--- a/samples/notebook/notebook.dsp
+++ b/samples/notebook/notebook.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\notebook"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\notebook"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\notebook"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\notebook"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj
index eb14dbd9ed12da1faebad30f45d271c3236d544d..97e998e431b9cbcbf1d780d30b6ab16b423bb36e 100644 (file)
--- a/samples/notebook/notebook_vc7.vcproj
+++ b/samples/notebook/notebook_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\notebook.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\notebook.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\notebook.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\notebook.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj
index 309bcd45e9f5478d36876ca4a2f2b02f10da43dd..177fe188c58bc2308ddecb5606e057a383867458 100644 (file)
--- a/samples/notebook/notebook_vc8.vcproj
+++ b/samples/notebook/notebook_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/notebook/notebook_vc9.vcproj b/samples/notebook/notebook_vc9.vcproj
index acc6b6adda752158a9eb7b8caa95151e372c706a..0d735ef79d13bbe5478e9859f95a3d4aa7e5ea5b 100644 (file)
--- a/samples/notebook/notebook_vc9.vcproj
+++ b/samples/notebook/notebook_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\notebook.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\notebook.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index b20407f68bc24bec62439f0f80cd9473b3510f9f..eac49ea1432e62c3f9dad0aa684d6487155f69f7 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index a10f61a09b801ef3c95c99c278fc8a5f2b952456..893dcbace01287b4deca2db51372aaf379b60664 100644 (file)
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OLEAUTO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-OLEAUTO_OBJECTS =  \\r
-       $(OBJS)\oleauto_oleauto.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\oleauto.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
-       -if exist $(OBJS)\oleauto.tds del $(OBJS)\oleauto.tds\r
-       -if exist $(OBJS)\oleauto.ilc del $(OBJS)\oleauto.ilc\r
-       -if exist $(OBJS)\oleauto.ild del $(OBJS)\oleauto.ild\r
-       -if exist $(OBJS)\oleauto.ilf del $(OBJS)\oleauto.ilf\r
-       -if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils\r
-\r
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS)  $(OBJS)\oleauto_oleauto.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_oleauto.res\r
-|\r
-\r
-$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp\r
-       $(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
-\r
-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\oleauto.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OLEAUTO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+OLEAUTO_OBJECTS =  \
+       $(OBJS)\oleauto_oleauto.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\oleauto.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
+       -if exist $(OBJS)\oleauto.tds del $(OBJS)\oleauto.tds
+       -if exist $(OBJS)\oleauto.ilc del $(OBJS)\oleauto.ilc
+       -if exist $(OBJS)\oleauto.ild del $(OBJS)\oleauto.ild
+       -if exist $(OBJS)\oleauto.ilf del $(OBJS)\oleauto.ilf
+       -if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils
+
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS)  $(OBJS)\oleauto_oleauto.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_oleauto.res
+|
+
+$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp
+       $(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp
+
+$(OBJS)\oleauto_oleauto.res: .\oleauto.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\oleauto.rc
+

diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index 2a0105a0adda14194ddb2120a374eb6fb32b9577..0e92f8ca53ed281fa81995877e3e881a87a679ed 100644 (file)
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OLEAUTO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-OLEAUTO_OBJECTS =  \\r
-       $(OBJS)\oleauto_oleauto.o \\r
-       $(OBJS)\oleauto_oleauto_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\oleauto.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
-\r
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o\r
-       $(CXX) -o $@ $(OLEAUTO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\oleauto_oleauto.o: ./oleauto.cpp\r
-       $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\oleauto_oleauto_rc.o: ./oleauto.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OLEAUTO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+OLEAUTO_OBJECTS =  \
+       $(OBJS)\oleauto_oleauto.o \
+       $(OBJS)\oleauto_oleauto_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\oleauto.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
+
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o
+       $(CXX) -o $@ $(OLEAUTO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\oleauto_oleauto.o: ./oleauto.cpp
+       $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\oleauto_oleauto_rc.o: ./oleauto.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx
index c8b85bc221761ddbc317617c50c91f7863ec7c0f..42f7b708d6982cade0b8afc3ff2806ea46bfdb5a 100644 (file)
--- a/samples/oleauto/makefile.unx
+++ b/samples/oleauto/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index 8fd19affb7a57156cf14456a827160d01083d04e..036a2c25c5f8940abc1f45b704d5350516f5a21f 100644 (file)
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-OLEAUTO_OBJECTS =  \\r
-       $(OBJS)\oleauto_oleauto.obj \\r
-       $(OBJS)\oleauto_oleauto.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\oleauto.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
-       -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk\r
-       -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb\r
-\r
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(OLEAUTO_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
-\r
-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\oleauto.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+OLEAUTO_OBJECTS =  \
+       $(OBJS)\oleauto_oleauto.obj
+OLEAUTO_RESOURCES =  \
+       $(OBJS)\oleauto_oleauto.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\oleauto.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
+       -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk
+       -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb
+
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(OLEAUTO_OBJECTS) $(OLEAUTO_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp
+
+$(OBJS)\oleauto_oleauto.res: .\oleauto.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\oleauto.rc
+

diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 3fe4f43add99dad1a21a6462f7336dac685d7311..45f51434765c174cd345c50b99a1afb0d82945e5 100644 (file)
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-OLEAUTO_OBJECTS =  &\r
-       $(OBJS)\oleauto_oleauto.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\oleauto.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
-\r
-$(OBJS)\oleauto.exe :  $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res\r
-       @%create $(OBJS)\oleauto.lbc\r
-       @%append $(OBJS)\oleauto.lbc option quiet\r
-       @%append $(OBJS)\oleauto.lbc name $^@\r
-       @%append $(OBJS)\oleauto.lbc option caseexact\r
-       @%append $(OBJS)\oleauto.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\oleauto.lbc library %i\r
-       @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res\r
-       @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i\r
-       wlink @$(OBJS)\oleauto.lbc\r
-\r
-$(OBJS)\oleauto_oleauto.obj :  .AUTODEPEND .\oleauto.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $<\r
-\r
-$(OBJS)\oleauto_oleauto.res :  .AUTODEPEND .\oleauto.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+OLEAUTO_OBJECTS =  &
+       $(OBJS)\oleauto_oleauto.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\oleauto.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
+
+$(OBJS)\oleauto.exe :  $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
+       @%create $(OBJS)\oleauto.lbc
+       @%append $(OBJS)\oleauto.lbc option quiet
+       @%append $(OBJS)\oleauto.lbc name $^@
+       @%append $(OBJS)\oleauto.lbc option caseexact
+       @%append $(OBJS)\oleauto.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\oleauto.lbc library %i
+       @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res
+       @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i
+       wlink @$(OBJS)\oleauto.lbc
+
+$(OBJS)\oleauto_oleauto.obj :  .AUTODEPEND .\oleauto.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $<
+
+$(OBJS)\oleauto_oleauto.res :  .AUTODEPEND .\oleauto.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/oleauto/oleauto.dsp b/samples/oleauto/oleauto.dsp
index 788fd3c388d2fb32af6ae0dd399d36c71a7981b5..e3cde0337c5f95dbeb94d2fc2d197b7e48d185c6 100644 (file)
--- a/samples/oleauto/oleauto.dsp
+++ b/samples/oleauto/oleauto.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\oleauto"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\oleauto"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\oleauto"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\oleauto"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj
index adbb8e564e2dfbe0d23c78e0479e1240bdef06ef..ba569829948e17b9bbc904dcbc06f196d41e09c4 100644 (file)
--- a/samples/oleauto/oleauto_vc7.vcproj
+++ b/samples/oleauto/oleauto_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\oleauto.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\oleauto.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\oleauto.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj
index fa3a1e26683d09440e765730836f657bc3b2eeb9..e2eb50e1653cb59df542491fc13ad42e93c02cf3 100644 (file)
--- a/samples/oleauto/oleauto_vc8.vcproj
+++ b/samples/oleauto/oleauto_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/oleauto/oleauto_vc9.vcproj b/samples/oleauto/oleauto_vc9.vcproj
index 92877106e7db8348fbc52da7ce811eaaae9fe677..ec1225d76289297cd32e883e0f5cd119e5f99363 100644 (file)
--- a/samples/oleauto/oleauto_vc9.vcproj
+++ b/samples/oleauto/oleauto_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\oleauto.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in
index bd794b7e8f17d7b15fc53d5eede3a50a578a7d23..8fb8def9b949c9fd92a07dc6a84b793d7e47ac9c 100644 (file)
--- a/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index 21e3e060673328e4a0a24413f79cbc9d5068f21f..575e76f429d9891769fbcd8b4d2372a8ef41b50e 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index cbd5e02df2c3ed9c01defa953eb5854a0e9c776b..941ad589e366d65dcd1c8277a4534159630d0a0d 100644 (file)
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\cube"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\cube"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\cube"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\cube"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\cube.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\cube.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/opengl/cube/cube_vc7.vcproj b/samples/opengl/cube/cube_vc7.vcproj
index 315177fc601d1db9bdd650030d0321efec3546d6..977ef4212cb37adc7981861633baad756f5a0e8b 100644 (file)
--- a/samples/opengl/cube/cube_vc7.vcproj
+++ b/samples/opengl/cube/cube_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\cube.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\cube.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\cube.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\cube.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj
index 4b407f96fafc88bd9abfeb14245d906ad6049a9e..3d9071f86ef0bc4f0170c94ced29d06fe31cf1da 100644 (file)
--- a/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/cube/cube_vc9.vcproj b/samples/opengl/cube/cube_vc9.vcproj
index 1cbdc70426de32dc4ececc464afe34f91de031e9..bc2830aff40ee88bf760e9012a55adfe78423ea1 100644 (file)
--- a/samples/opengl/cube/cube_vc9.vcproj
+++ b/samples/opengl/cube/cube_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\cube.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\cube.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index 847c2d78f190d20242024da1798946f88e6295ba..951f545166fcbacbf9ac3adddd96ac297986053f 100644 (file)
--- a/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -1,237 +1,237 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CUBE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CUBE_OBJECTS =  \\r
-       $(OBJS)\cube_cube.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__cube___depname = $(OBJS)\cube.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__cube___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
-       -if exist $(OBJS)\cube.tds del $(OBJS)\cube.tds\r
-       -if exist $(OBJS)\cube.ilc del $(OBJS)\cube.ilc\r
-       -if exist $(OBJS)\cube.ild del $(OBJS)\cube.ild\r
-       -if exist $(OBJS)\cube.ilf del $(OBJS)\cube.ilf\r
-       -if exist $(OBJS)\cube.ils del $(OBJS)\cube.ils\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\cube.exe: $(CUBE_OBJECTS)  $(OBJS)\cube_cube.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_cube.res\r
-|\r
-!endif\r
-\r
-$(OBJS)\cube_cube.obj: .\cube.cpp\r
-       $(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
-\r
-$(OBJS)\cube_cube.res: .\cube.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\cube.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CUBE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CUBE_OBJECTS =  \
+       $(OBJS)\cube_cube.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__cube___depname = $(OBJS)\cube.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__cube___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
+       -if exist $(OBJS)\cube.tds del $(OBJS)\cube.tds
+       -if exist $(OBJS)\cube.ilc del $(OBJS)\cube.ilc
+       -if exist $(OBJS)\cube.ild del $(OBJS)\cube.ild
+       -if exist $(OBJS)\cube.ilf del $(OBJS)\cube.ilf
+       -if exist $(OBJS)\cube.ils del $(OBJS)\cube.ils
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\cube.exe: $(CUBE_OBJECTS)  $(OBJS)\cube_cube.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_cube.res
+|
+!endif
+
+$(OBJS)\cube_cube.obj: .\cube.cpp
+       $(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) .\cube.cpp
+
+$(OBJS)\cube_cube.res: .\cube.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\cube.rc
+

diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 1894ce7b30c511b228c0099a366c174fb3df1adc..f28ac4d8f2106398dd8c8b19ca93d7c4e1788906 100644 (file)
--- a/samples/opengl/cube/makefile.gcc
+++ b/samples/opengl/cube/makefile.gcc
@@ -1,231 +1,231 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CUBE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-CUBE_OBJECTS =  \\r
-       $(OBJS)\cube_cube.o \\r
-       $(OBJS)\cube_cube_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_OPENGL),1)\r
-__cube___depname = $(OBJS)\cube.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__cube___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
-\r
-ifeq ($(USE_OPENGL),1)\r
-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o\r
-       $(CXX) -o $@ $(CUBE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\cube_cube.o: ./cube.cpp\r
-       $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\cube_cube_rc.o: ./cube.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CUBE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+CUBE_OBJECTS =  \
+       $(OBJS)\cube_cube.o \
+       $(OBJS)\cube_cube_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_OPENGL),1)
+__cube___depname = $(OBJS)\cube.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__cube___depname)
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
+
+ifeq ($(USE_OPENGL),1)
+$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o
+       $(CXX) -o $@ $(CUBE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\cube_cube.o: ./cube.cpp
+       $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\cube_cube_rc.o: ./cube.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index 422913fd5ba3db2627e34e129158642ad4f4325b..af8c79fd21bb18e417aaf4727d2ecaec006f01ce 100644 (file)
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index cfd2b2c7b2c7df60d4de8eecf421a52ea01bc412..c5687e40f76b9c5b42c9a04ff5b628b346504c1b 100644 (file)
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -1,316 +1,341 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-CUBE_OBJECTS =  \\r
-       $(OBJS)\cube_cube.obj \\r
-       $(OBJS)\cube_cube.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__cube___depname = $(OBJS)\cube.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__cube___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
-       -if exist $(OBJS)\cube.ilk del $(OBJS)\cube.ilk\r
-       -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CUBE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\cube_cube.obj: .\cube.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
-\r
-$(OBJS)\cube_cube.res: .\cube.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\cube.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+CUBE_OBJECTS =  \
+       $(OBJS)\cube_cube.obj
+CUBE_RESOURCES =  \
+       $(OBJS)\cube_cube.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__cube___depname = $(OBJS)\cube.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__cube___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
+       -if exist $(OBJS)\cube.ilk del $(OBJS)\cube.ilk
+       -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CUBE_OBJECTS) $(CUBE_RESOURCES)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\cube_cube.obj: .\cube.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp
+
+$(OBJS)\cube_cube.res: .\cube.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\cube.rc
+

diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index 8628fc655f4369bcabc2a8c4ae2c8608becf0d01..fe5515c30e4c045425e974accc0e6a87934e22d1 100644 (file)
--- a/samples/opengl/cube/makefile.wat
+++ b/samples/opengl/cube/makefile.wat
@@ -1,266 +1,266 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__cube___depname =\r
-!ifeq USE_OPENGL 1\r
-__cube___depname = $(OBJS)\cube.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-CUBE_OBJECTS =  &\r
-       $(OBJS)\cube_cube.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__cube___depname)\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
-\r
-!ifeq USE_OPENGL 1\r
-$(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res\r
-       @%create $(OBJS)\cube.lbc\r
-       @%append $(OBJS)\cube.lbc option quiet\r
-       @%append $(OBJS)\cube.lbc name $^@\r
-       @%append $(OBJS)\cube.lbc option caseexact\r
-       @%append $(OBJS)\cube.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i\r
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\cube.lbc library %i\r
-       @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res\r
-       @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i\r
-       wlink @$(OBJS)\cube.lbc\r
-!endif\r
-\r
-$(OBJS)\cube_cube.obj :  .AUTODEPEND .\cube.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $<\r
-\r
-$(OBJS)\cube_cube.res :  .AUTODEPEND .\cube.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__cube___depname =
+!ifeq USE_OPENGL 1
+__cube___depname = $(OBJS)\cube.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+CUBE_OBJECTS =  &
+       $(OBJS)\cube_cube.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__cube___depname)
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
+
+!ifeq USE_OPENGL 1
+$(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
+       @%create $(OBJS)\cube.lbc
+       @%append $(OBJS)\cube.lbc option quiet
+       @%append $(OBJS)\cube.lbc name $^@
+       @%append $(OBJS)\cube.lbc option caseexact
+       @%append $(OBJS)\cube.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\cube.lbc library %i
+       @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
+       @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i
+       wlink @$(OBJS)\cube.lbc
+!endif
+
+$(OBJS)\cube_cube.obj :  .AUTODEPEND .\cube.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $<
+
+$(OBJS)\cube_cube.res :  .AUTODEPEND .\cube.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index d1a86f7f502d444ef3f855152f1dc8f0203e3e54..8aff1de9228b2376ff91bb1fa5bfabdb09f47ec5 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/isosurf/isosurf.dsp b/samples/opengl/isosurf/isosurf.dsp
index e87081327196e63ef6f3eb9431ce1968367c3a5b..1d2467832db480623bda5445d172ca1b83fb4f36 100644 (file)
--- a/samples/opengl/isosurf/isosurf.dsp
+++ b/samples/opengl/isosurf/isosurf.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\isosurf"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\isosurf"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\isosurf"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\isosurf"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/opengl/isosurf/isosurf_vc7.vcproj b/samples/opengl/isosurf/isosurf_vc7.vcproj
index e4d99453e32750d68f86bb173a59ca78db5af9fd..c1db397238cbdc7c49fbe6d9402b1ea89a9e62d1 100644 (file)
--- a/samples/opengl/isosurf/isosurf_vc7.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\isosurf.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\isosurf.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\isosurf.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/opengl/isosurf/isosurf_vc8.vcproj b/samples/opengl/isosurf/isosurf_vc8.vcproj
index d21c0e39a3e3f4e224bac1e602023ce4b5c2c7ec..980e9cd48611c1310edaa071001c941a6bcd0a77 100644 (file)
--- a/samples/opengl/isosurf/isosurf_vc8.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/isosurf/isosurf_vc9.vcproj b/samples/opengl/isosurf/isosurf_vc9.vcproj
index 29498d2fa5ef1ebaea8d2e8e245f99b6137efc8f..492de510d8ca7fa808b625b1725fdcfc1a4f8741 100644 (file)
--- a/samples/opengl/isosurf/isosurf_vc9.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\isosurf.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc
index 7e23ad1db4d251581139350ce51f94004d04989e..0df5ff86bad48040c3f101e51b6cfe795555fb50 100644 (file)
--- a/samples/opengl/isosurf/makefile.bcc
+++ b/samples/opengl/isosurf/makefile.bcc
@@ -1,241 +1,241 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ISOSURF_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-ISOSURF_OBJECTS =  \\r
-       $(OBJS)\isosurf_isosurf.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__isosurf___depname = $(OBJS)\isosurf.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__isosurf___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe\r
-       -if exist $(OBJS)\isosurf.tds del $(OBJS)\isosurf.tds\r
-       -if exist $(OBJS)\isosurf.ilc del $(OBJS)\isosurf.ilc\r
-       -if exist $(OBJS)\isosurf.ild del $(OBJS)\isosurf.ild\r
-       -if exist $(OBJS)\isosurf.ilf del $(OBJS)\isosurf.ilf\r
-       -if exist $(OBJS)\isosurf.ils del $(OBJS)\isosurf.ils\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS)  $(OBJS)\isosurf_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\isosurf_sample.res\r
-|\r
-!endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc\r
-\r
-$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp\r
-       $(CXX) -q -c -P -o$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ISOSURF_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+ISOSURF_OBJECTS =  \
+       $(OBJS)\isosurf_isosurf.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__isosurf___depname = $(OBJS)\isosurf.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__isosurf___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe
+       -if exist $(OBJS)\isosurf.tds del $(OBJS)\isosurf.tds
+       -if exist $(OBJS)\isosurf.ilc del $(OBJS)\isosurf.ilc
+       -if exist $(OBJS)\isosurf.ild del $(OBJS)\isosurf.ild
+       -if exist $(OBJS)\isosurf.ilf del $(OBJS)\isosurf.ilf
+       -if exist $(OBJS)\isosurf.ils del $(OBJS)\isosurf.ils
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS)  $(OBJS)\isosurf_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\isosurf_sample.res
+|
+!endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp
+       $(CXX) -q -c -P -o$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp
+

diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc
index b5b4989fadeedf2023991ee3a22baa960b92bbb7..d5876ce399eca8453b78a53d6c241b701e482a00 100644 (file)
--- a/samples/opengl/isosurf/makefile.gcc
+++ b/samples/opengl/isosurf/makefile.gcc
@@ -1,235 +1,235 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ISOSURF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-ISOSURF_OBJECTS =  \\r
-       $(OBJS)\isosurf_sample_rc.o \\r
-       $(OBJS)\isosurf_isosurf.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_OPENGL),1)\r
-__isosurf___depname = $(OBJS)\isosurf.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__isosurf___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe\r
-\r
-ifeq ($(USE_OPENGL),1)\r
-$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample_rc.o\r
-       $(CXX) -o $@ $(ISOSURF_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (isosurf.dat.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\isosurf_sample_rc.o: ./../../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-$(OBJS)\isosurf_isosurf.o: ./isosurf.cpp\r
-       $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ISOSURF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ISOSURF_OBJECTS =  \
+       $(OBJS)\isosurf_sample_rc.o \
+       $(OBJS)\isosurf_isosurf.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_OPENGL),1)
+__isosurf___depname = $(OBJS)\isosurf.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__isosurf___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe
+
+ifeq ($(USE_OPENGL),1)
+$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample_rc.o
+       $(CXX) -o $@ $(ISOSURF_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (isosurf.dat.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\isosurf_sample_rc.o: ./../../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+$(OBJS)\isosurf_isosurf.o: ./isosurf.cpp
+       $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index a5c032442e52ff1aaa31f457d0b5113c3bb9c61d..e45b8470552603f1869726c9dc7eef33b3e04088 100644 (file)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc
index 1bde51f2a7b3c3f9bb4aa0248aed2c23e5c57ead..f7abf8124b9c0455f927621da6d85dd5a2fa3cc6 100644 (file)
--- a/samples/opengl/isosurf/makefile.vc
+++ b/samples/opengl/isosurf/makefile.vc
@@ -1,320 +1,345 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-ISOSURF_OBJECTS =  \\r
-       $(OBJS)\isosurf_sample.res \\r
-       $(OBJS)\isosurf_isosurf.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__isosurf___depname = $(OBJS)\isosurf.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__isosurf___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe\r
-       -if exist $(OBJS)\isosurf.ilk del $(OBJS)\isosurf.ilk\r
-       -if exist $(OBJS)\isosurf.pdb del $(OBJS)\isosurf.pdb\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(ISOSURF_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc\r
-\r
-$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+ISOSURF_OBJECTS =  \
+       $(OBJS)\isosurf_isosurf.obj
+ISOSURF_RESOURCES =  \
+       $(OBJS)\isosurf_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__isosurf___depname = $(OBJS)\isosurf.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__isosurf___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe
+       -if exist $(OBJS)\isosurf.ilk del $(OBJS)\isosurf.ilk
+       -if exist $(OBJS)\isosurf.pdb del $(OBJS)\isosurf.pdb
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(ISOSURF_OBJECTS) $(ISOSURF_RESOURCES)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp
+

diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat
index 6ed9b2ccfe81999584aefb8367399ac4becd0275..a0289347c429a628759beaa971508413154a9075 100644 (file)
--- a/samples/opengl/isosurf/makefile.wat
+++ b/samples/opengl/isosurf/makefile.wat
@@ -1,270 +1,270 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__isosurf___depname =\r
-!ifeq USE_OPENGL 1\r
-__isosurf___depname = $(OBJS)\isosurf.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-ISOSURF_OBJECTS =  &\r
-       $(OBJS)\isosurf_isosurf.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__isosurf___depname) data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe\r
-\r
-!ifeq USE_OPENGL 1\r
-$(OBJS)\isosurf.exe :  $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res\r
-       @%create $(OBJS)\isosurf.lbc\r
-       @%append $(OBJS)\isosurf.lbc option quiet\r
-       @%append $(OBJS)\isosurf.lbc name $^@\r
-       @%append $(OBJS)\isosurf.lbc option caseexact\r
-       @%append $(OBJS)\isosurf.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i\r
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\isosurf.lbc library %i\r
-       @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res\r
-       @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i\r
-       wlink @$(OBJS)\isosurf.lbc\r
-!endif\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\isosurf_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\isosurf_isosurf.obj :  .AUTODEPEND .\isosurf.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__isosurf___depname =
+!ifeq USE_OPENGL 1
+__isosurf___depname = $(OBJS)\isosurf.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+ISOSURF_OBJECTS =  &
+       $(OBJS)\isosurf_isosurf.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__isosurf___depname) data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe
+
+!ifeq USE_OPENGL 1
+$(OBJS)\isosurf.exe :  $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
+       @%create $(OBJS)\isosurf.lbc
+       @%append $(OBJS)\isosurf.lbc option quiet
+       @%append $(OBJS)\isosurf.lbc name $^@
+       @%append $(OBJS)\isosurf.lbc option caseexact
+       @%append $(OBJS)\isosurf.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\isosurf.lbc library %i
+       @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res
+       @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i
+       wlink @$(OBJS)\isosurf.lbc
+!endif
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\isosurf_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
+$(OBJS)\isosurf_isosurf.obj :  .AUTODEPEND .\isosurf.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $<
+

diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc
index 49944e8461966cc2a48cacc04e7d61f69f8dc5e0..10e8eafb51657c6ccf8f7d3fbf2e8ffb7c235d0e 100644 (file)
--- a/samples/opengl/makefile.bcc
+++ b/samples/opengl/makefile.bcc
@@ -1,83 +1,83 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \\r
-       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \\r
-       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \\r
-       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \\r
-       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \\r
-       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \\r
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \\r
-       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \\r
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
-       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
-       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
-       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: cube isosurf penguin\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.csm del .\*.csm\r
-       @echo cd cube >cube.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat\r
-       call cube.bat\r
-       @del cube.bat\r
-       @echo cd isosurf >isosurf.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat\r
-       call isosurf.bat\r
-       @del isosurf.bat\r
-       @echo cd penguin >penguin.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat\r
-       call penguin.bat\r
-       @del penguin.bat\r
-\r
-cube: \r
-       @echo cd cube >cube.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat\r
-       call cube.bat\r
-       @del cube.bat\r
-\r
-isosurf: \r
-       @echo cd isosurf >isosurf.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat\r
-       call isosurf.bat\r
-       @del isosurf.bat\r
-\r
-penguin: \r
-       @echo cd penguin >penguin.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat\r
-       call penguin.bat\r
-       @del penguin.bat\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
+       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: cube isosurf penguin
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd cube >cube.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat
+       call cube.bat
+       @del cube.bat
+       @echo cd isosurf >isosurf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat
+       call isosurf.bat
+       @del isosurf.bat
+       @echo cd penguin >penguin.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat
+       call penguin.bat
+       @del penguin.bat
+
+cube: 
+       @echo cd cube >cube.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat
+       call cube.bat
+       @del cube.bat
+
+isosurf: 
+       @echo cd isosurf >isosurf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat
+       call isosurf.bat
+       @del isosurf.bat
+
+penguin: 
+       @echo cd penguin >penguin.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat
+       call penguin.bat
+       @del penguin.bat
+

diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc
index c4e188893088ffae4e042c556e924c9119ab549f..2a93727f2c0699372b2ec892d6fbd66e3f95aa86 100644 (file)
--- a/samples/opengl/makefile.gcc
+++ b/samples/opengl/makefile.gcc
@@ -1,63 +1,63 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: cube isosurf penguin\r
-\r
-clean: \r
-       -if exist .\*.o del .\*.o\r
-       -if exist .\*.d del .\*.d\r
-       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean\r
-\r
-cube: \r
-       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all\r
-\r
-isosurf: \r
-       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all\r
-\r
-penguin: \r
-       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all\r
-\r
-.PHONY: all clean cube isosurf penguin\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include ./*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: cube isosurf penguin
+
+clean: 
+       -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean
+
+cube: 
+       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all
+
+isosurf: 
+       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all
+
+penguin: 
+       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean cube isosurf penguin
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d

diff --git a/samples/opengl/makefile.unx b/samples/opengl/makefile.unx
index 3402cd769d19e9aead714bfa029552033ea7dc22..0463df6e953bc378db5ade5b19b043bea4978b22 100644 (file)
--- a/samples/opengl/makefile.unx
+++ b/samples/opengl/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index 2da245b0cbd01df18240b6157317e665457a985d..ee5a15e35582f66278f7196f18cb97af3ce003a2 100644 (file)
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -1,68 +1,68 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
-       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: sub_cube sub_isosurf sub_penguin\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.pch del .\*.pch\r
-       cd cube\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd isosurf\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd penguin\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_cube: \r
-       cd cube\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_isosurf: \r
-       cd isosurf\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_penguin: \r
-       cd penguin\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_cube sub_isosurf sub_penguin
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd cube
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd isosurf
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd penguin
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+
+sub_cube: 
+       cd cube
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_isosurf: 
+       cd isosurf
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_penguin: 
+       cd penguin
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+

diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat
index bc22385170942ff48b98fdbad56c5ff7d6bbe54c..9bb0275c8c42f6c48d0c106839c556cc8cdf44c0 100644 (file)
--- a/samples/opengl/makefile.wat
+++ b/samples/opengl/makefile.wat
@@ -1,88 +1,88 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC cube isosurf penguin\r
-\r
-clean : .SYMBOLIC \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.lbc del .\*.lbc\r
-       -if exist .\*.ilk del .\*.ilk\r
-       -if exist .\*.pch del .\*.pch\r
-       cd cube\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd isosurf\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd penguin\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-\r
-cube : .SYMBOLIC \r
-       cd cube\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-isosurf : .SYMBOLIC \r
-       cd isosurf\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-penguin : .SYMBOLIC \r
-       cd penguin\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+
+### Targets: ###
+
+all : .SYMBOLIC cube isosurf penguin
+
+clean : .SYMBOLIC 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd cube
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd isosurf
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd penguin
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+cube : .SYMBOLIC 
+       cd cube
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+isosurf : .SYMBOLIC 
+       cd isosurf
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+penguin : .SYMBOLIC 
+       cd penguin
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 1f92494707cb1644d9854170bc78b15f85ebc604..feea7824064ac8eb6a18ed9b8325bdcb887f2818 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc
index 312d004e65f47b5341d714add310068640550099..b85a7dd11ece992fd2764fd0572cbbeef114dfbb 100644 (file)
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -1,255 +1,255 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PENGUIN_CFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS)\r
-PENGUIN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-PENGUIN_OBJECTS =  \\r
-       $(OBJS)\penguin_penguin.obj \\r
-       $(OBJS)\penguin_dxfrenderer.obj \\r
-       $(OBJS)\penguin_trackball.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__penguin___depname = $(OBJS)\penguin.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__penguin___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
-       -if exist $(OBJS)\penguin.tds del $(OBJS)\penguin.tds\r
-       -if exist $(OBJS)\penguin.ilc del $(OBJS)\penguin.ilc\r
-       -if exist $(OBJS)\penguin.ild del $(OBJS)\penguin.ild\r
-       -if exist $(OBJS)\penguin.ilf del $(OBJS)\penguin.ilf\r
-       -if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS)  $(OBJS)\penguin_penguin.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res\r
-|\r
-!endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\penguin_penguin.obj: .\penguin.cpp\r
-       $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
-\r
-$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp\r
-       $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp\r
-\r
-$(OBJS)\penguin_trackball.obj: .\trackball.c\r
-       $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c\r
-\r
-$(OBJS)\penguin_penguin.res: .\penguin.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\penguin.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PENGUIN_CFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS)
+PENGUIN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+PENGUIN_OBJECTS =  \
+       $(OBJS)\penguin_penguin.obj \
+       $(OBJS)\penguin_dxfrenderer.obj \
+       $(OBJS)\penguin_trackball.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__penguin___depname = $(OBJS)\penguin.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__penguin___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
+       -if exist $(OBJS)\penguin.tds del $(OBJS)\penguin.tds
+       -if exist $(OBJS)\penguin.ilc del $(OBJS)\penguin.ilc
+       -if exist $(OBJS)\penguin.ild del $(OBJS)\penguin.ild
+       -if exist $(OBJS)\penguin.ilf del $(OBJS)\penguin.ilf
+       -if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS)  $(OBJS)\penguin_penguin.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res
+|
+!endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\penguin_penguin.obj: .\penguin.cpp
+       $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp
+
+$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
+       $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp
+
+$(OBJS)\penguin_trackball.obj: .\trackball.c
+       $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c
+
+$(OBJS)\penguin_penguin.res: .\penguin.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\penguin.rc
+

diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index 6b6542df3baffb64d5a0889842d1b16c47261e24..ec42cb9c0f8b7504dd22f02fe975087f1bb2a95e 100644 (file)
--- a/samples/opengl/penguin/makefile.gcc
+++ b/samples/opengl/penguin/makefile.gcc
@@ -1,249 +1,249 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PENGUIN_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS)\r
-PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-PENGUIN_OBJECTS =  \\r
-       $(OBJS)\penguin_penguin.o \\r
-       $(OBJS)\penguin_dxfrenderer.o \\r
-       $(OBJS)\penguin_trackball.o \\r
-       $(OBJS)\penguin_penguin_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_OPENGL),1)\r
-__penguin___depname = $(OBJS)\penguin.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__penguin___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
-\r
-ifeq ($(USE_OPENGL),1)\r
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o\r
-       $(CXX) -o $@ $(PENGUIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\penguin_penguin.o: ./penguin.cpp\r
-       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp\r
-       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\penguin_trackball.o: ./trackball.c\r
-       $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\penguin_penguin_rc.o: ./penguin.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PENGUIN_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS)
+PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+PENGUIN_OBJECTS =  \
+       $(OBJS)\penguin_penguin.o \
+       $(OBJS)\penguin_dxfrenderer.o \
+       $(OBJS)\penguin_trackball.o \
+       $(OBJS)\penguin_penguin_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_OPENGL),1)
+__penguin___depname = $(OBJS)\penguin.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__penguin___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
+
+ifeq ($(USE_OPENGL),1)
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o
+       $(CXX) -o $@ $(PENGUIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\penguin_penguin.o: ./penguin.cpp
+       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp
+       $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\penguin_trackball.o: ./trackball.c
+       $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\penguin_penguin_rc.o: ./penguin.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index a3a8cececb1a2708846a7e157c2a73f2afeceaaf..0c010e9fe6a8f675e0776080d49945e3ed1a38eb 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index c0880b2f5ea5b649c97412f1c52fa88f506e8700..492d4b16a83f5bf794113004c2ba50392d0de76f 100644 (file)
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -1,335 +1,361 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) $(CFLAGS)\r
-PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-PENGUIN_OBJECTS =  \\r
-       $(OBJS)\penguin_penguin.obj \\r
-       $(OBJS)\penguin_dxfrenderer.obj \\r
-       $(OBJS)\penguin_trackball.obj \\r
-       $(OBJS)\penguin_penguin.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_OPENGL)" == "1"\r
-__penguin___depname = $(OBJS)\penguin.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__penguin___depname) data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
-       -if exist $(OBJS)\penguin.ilk del $(OBJS)\penguin.ilk\r
-       -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb\r
-\r
-!if "$(USE_OPENGL)" == "1"\r
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(PENGUIN_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\penguin_penguin.obj: .\penguin.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
-\r
-$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp\r
-\r
-$(OBJS)\penguin_trackball.obj: .\trackball.c\r
-       $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c\r
-\r
-$(OBJS)\penguin_penguin.res: .\penguin.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\penguin.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) \
+       $(CFLAGS)
+PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+PENGUIN_OBJECTS =  \
+       $(OBJS)\penguin_penguin.obj \
+       $(OBJS)\penguin_dxfrenderer.obj \
+       $(OBJS)\penguin_trackball.obj
+PENGUIN_RESOURCES =  \
+       $(OBJS)\penguin_penguin.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_OPENGL)" == "1"
+__penguin___depname = $(OBJS)\penguin.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__penguin___depname) data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
+       -if exist $(OBJS)\penguin.ilk del $(OBJS)\penguin.ilk
+       -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb
+
+!if "$(USE_OPENGL)" == "1"
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(PENGUIN_OBJECTS) $(PENGUIN_RESOURCES)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\penguin_penguin.obj: .\penguin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp
+
+$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp
+
+$(OBJS)\penguin_trackball.obj: .\trackball.c
+       $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c
+
+$(OBJS)\penguin_penguin.res: .\penguin.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\penguin.rc
+

diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index 8e93fe0a8825a74f73569b2062e8b70725d373f8..94daa4e204d0eeaf30f83e680bbb1e68999d60b5 100644 (file)
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -1,284 +1,284 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__penguin___depname =\r
-!ifeq USE_OPENGL 1\r
-__penguin___depname = $(OBJS)\penguin.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(CPPFLAGS) $(CFLAGS)\r
-PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-PENGUIN_OBJECTS =  &\r
-       $(OBJS)\penguin_penguin.obj &\r
-       $(OBJS)\penguin_dxfrenderer.obj &\r
-       $(OBJS)\penguin_trackball.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__penguin___depname) data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
-\r
-!ifeq USE_OPENGL 1\r
-$(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res\r
-       @%create $(OBJS)\penguin.lbc\r
-       @%append $(OBJS)\penguin.lbc option quiet\r
-       @%append $(OBJS)\penguin.lbc name $^@\r
-       @%append $(OBJS)\penguin.lbc option caseexact\r
-       @%append $(OBJS)\penguin.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i\r
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\penguin.lbc library %i\r
-       @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res\r
-       @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i\r
-       wlink @$(OBJS)\penguin.lbc\r
-!endif\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<\r
-\r
-$(OBJS)\penguin_dxfrenderer.obj :  .AUTODEPEND .\dxfrenderer.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<\r
-\r
-$(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c\r
-       $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $<\r
-\r
-$(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__penguin___depname =
+!ifeq USE_OPENGL 1
+__penguin___depname = $(OBJS)\penguin.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(CPPFLAGS) $(CFLAGS)
+PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+PENGUIN_OBJECTS =  &
+       $(OBJS)\penguin_penguin.obj &
+       $(OBJS)\penguin_dxfrenderer.obj &
+       $(OBJS)\penguin_trackball.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__penguin___depname) data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
+
+!ifeq USE_OPENGL 1
+$(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
+       @%create $(OBJS)\penguin.lbc
+       @%append $(OBJS)\penguin.lbc option quiet
+       @%append $(OBJS)\penguin.lbc name $^@
+       @%append $(OBJS)\penguin.lbc option caseexact
+       @%append $(OBJS)\penguin.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\penguin.lbc library %i
+       @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res
+       @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i
+       wlink @$(OBJS)\penguin.lbc
+!endif
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
+
+$(OBJS)\penguin_dxfrenderer.obj :  .AUTODEPEND .\dxfrenderer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
+
+$(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c
+       $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $<
+
+$(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 0c8fae4a15c1e45a24c7600a9c1a794f7d547b8b..dab0e06331ca3d651106db2a7124a126956742b6 100644 (file)
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\penguin"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\penguin"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\penguin"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\penguin"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj
index a0ccccbb6889cb62e635158d2c3dc970b7d4f8a1..541a43ba8cb9b731e621dca73d1df865113235ad 100644 (file)
--- a/samples/opengl/penguin/penguin_vc7.vcproj
+++ b/samples/opengl/penguin/penguin_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\penguin.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\penguin.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\penguin.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\penguin.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj
index c79f175ba688e3226e3cd66a4fc1be27024af808..6a28b7d21b78bfc867e161d129ef3fcde913f23f 100644 (file)
--- a/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/opengl/penguin/penguin_vc9.vcproj b/samples/opengl/penguin/penguin_vc9.vcproj
index 281271ac8ac5d6b993ef08731bb57fb7893d505f..2d86d94e960dead8f3bc92f2e70a244e239ef3cb 100644 (file)
--- a/samples/opengl/penguin/penguin_vc9.vcproj
+++ b/samples/opengl/penguin/penguin_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_gl.lib opengl32.lib glu32.lib wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_gl.lib opengl32.lib glu32.lib wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\penguin.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\penguin.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index 5d73904a0936bef8c8dc55a1d4c400027253948f..808a06276e06587ac82d660c755c072717aec282 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc
index 8041b4d16cb41e5905cbcc7cde0ece12ae26f6fa..6d8eda83c0a23aa150bc319a0edeb0f6d8a28045 100644 (file)
--- a/samples/ownerdrw/makefile.bcc
+++ b/samples/ownerdrw/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OWNERDRW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-OWNERDRW_OBJECTS =  \\r
-       $(OBJS)\ownerdrw_ownerdrw.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ownerdrw.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe\r
-       -if exist $(OBJS)\ownerdrw.tds del $(OBJS)\ownerdrw.tds\r
-       -if exist $(OBJS)\ownerdrw.ilc del $(OBJS)\ownerdrw.ilc\r
-       -if exist $(OBJS)\ownerdrw.ild del $(OBJS)\ownerdrw.ild\r
-       -if exist $(OBJS)\ownerdrw.ilf del $(OBJS)\ownerdrw.ilf\r
-       -if exist $(OBJS)\ownerdrw.ils del $(OBJS)\ownerdrw.ils\r
-\r
-$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS)  $(OBJS)\ownerdrw_ownerdrw.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(OWNERDRW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ownerdrw_ownerdrw.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp\r
-       $(CXX) -q -c -P -o$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\ownerdrw.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OWNERDRW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+OWNERDRW_OBJECTS =  \
+       $(OBJS)\ownerdrw_ownerdrw.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ownerdrw.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
+       -if exist $(OBJS)\ownerdrw.tds del $(OBJS)\ownerdrw.tds
+       -if exist $(OBJS)\ownerdrw.ilc del $(OBJS)\ownerdrw.ilc
+       -if exist $(OBJS)\ownerdrw.ild del $(OBJS)\ownerdrw.ild
+       -if exist $(OBJS)\ownerdrw.ilf del $(OBJS)\ownerdrw.ilf
+       -if exist $(OBJS)\ownerdrw.ils del $(OBJS)\ownerdrw.ils
+
+$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS)  $(OBJS)\ownerdrw_ownerdrw.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(OWNERDRW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ownerdrw_ownerdrw.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp
+       $(CXX) -q -c -P -o$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp
+
+$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\ownerdrw.rc
+

diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index ac0e2b436e63d504371017576b3aaa3b73f9ba97..b642c465a143e3f622044e3dab99be105f72ce52 100644 (file)
--- a/samples/ownerdrw/makefile.gcc
+++ b/samples/ownerdrw/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OWNERDRW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-OWNERDRW_OBJECTS =  \\r
-       $(OBJS)\ownerdrw_ownerdrw.o \\r
-       $(OBJS)\ownerdrw_ownerdrw_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ownerdrw.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe\r
-\r
-$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw_rc.o\r
-       $(CXX) -o $@ $(OWNERDRW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (sound.png nosound.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.o: ./ownerdrw.cpp\r
-       $(CXX) -c -o $@ $(OWNERDRW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\ownerdrw_ownerdrw_rc.o: ./ownerdrw.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OWNERDRW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+OWNERDRW_OBJECTS =  \
+       $(OBJS)\ownerdrw_ownerdrw.o \
+       $(OBJS)\ownerdrw_ownerdrw_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ownerdrw.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
+
+$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw_rc.o
+       $(CXX) -o $@ $(OWNERDRW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (sound.png nosound.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\ownerdrw_ownerdrw.o: ./ownerdrw.cpp
+       $(CXX) -c -o $@ $(OWNERDRW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ownerdrw_ownerdrw_rc.o: ./ownerdrw.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx
index 0a93dab976b6823079258c798c67e743f6d5e5fe..05e4737b86b02b6673c69192745dddc00638cbde 100644 (file)
--- a/samples/ownerdrw/makefile.unx
+++ b/samples/ownerdrw/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc
index c3723c57d130d4db5191278a8764b9f376582329..b811224c924a4c98d4c2349e4f37a27a5327d8a9 100644 (file)
--- a/samples/ownerdrw/makefile.vc
+++ b/samples/ownerdrw/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-OWNERDRW_OBJECTS =  \\r
-       $(OBJS)\ownerdrw_ownerdrw.obj \\r
-       $(OBJS)\ownerdrw_ownerdrw.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ownerdrw.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe\r
-       -if exist $(OBJS)\ownerdrw.ilk del $(OBJS)\ownerdrw.ilk\r
-       -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb\r
-\r
-$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(OWNERDRW_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\ownerdrw.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+OWNERDRW_OBJECTS =  \
+       $(OBJS)\ownerdrw_ownerdrw.obj
+OWNERDRW_RESOURCES =  \
+       $(OBJS)\ownerdrw_ownerdrw.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ownerdrw.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
+       -if exist $(OBJS)\ownerdrw.ilk del $(OBJS)\ownerdrw.ilk
+       -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb
+
+$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(OWNERDRW_OBJECTS) $(OWNERDRW_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp
+
+$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\ownerdrw.rc
+

diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat
index 988af60b0cd6c859a43df118493d12329b23eced..a7a599c701cbe9935a1d6933c05341b0affa519f 100644 (file)
--- a/samples/ownerdrw/makefile.wat
+++ b/samples/ownerdrw/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-OWNERDRW_OBJECTS =  &\r
-       $(OBJS)\ownerdrw_ownerdrw.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\ownerdrw.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe\r
-\r
-$(OBJS)\ownerdrw.exe :  $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res\r
-       @%create $(OBJS)\ownerdrw.lbc\r
-       @%append $(OBJS)\ownerdrw.lbc option quiet\r
-       @%append $(OBJS)\ownerdrw.lbc name $^@\r
-       @%append $(OBJS)\ownerdrw.lbc option caseexact\r
-       @%append $(OBJS)\ownerdrw.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ownerdrw.lbc library %i\r
-       @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res\r
-       @for %i in () do @%append $(OBJS)\ownerdrw.lbc option stack=%i\r
-       wlink @$(OBJS)\ownerdrw.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.obj :  .AUTODEPEND .\ownerdrw.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $<\r
-\r
-$(OBJS)\ownerdrw_ownerdrw.res :  .AUTODEPEND .\ownerdrw.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+OWNERDRW_OBJECTS =  &
+       $(OBJS)\ownerdrw_ownerdrw.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\ownerdrw.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
+
+$(OBJS)\ownerdrw.exe :  $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res
+       @%create $(OBJS)\ownerdrw.lbc
+       @%append $(OBJS)\ownerdrw.lbc option quiet
+       @%append $(OBJS)\ownerdrw.lbc name $^@
+       @%append $(OBJS)\ownerdrw.lbc option caseexact
+       @%append $(OBJS)\ownerdrw.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ownerdrw.lbc library %i
+       @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res
+       @for %i in () do @%append $(OBJS)\ownerdrw.lbc option stack=%i
+       wlink @$(OBJS)\ownerdrw.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\ownerdrw_ownerdrw.obj :  .AUTODEPEND .\ownerdrw.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $<
+
+$(OBJS)\ownerdrw_ownerdrw.res :  .AUTODEPEND .\ownerdrw.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/ownerdrw/ownerdrw.dsp b/samples/ownerdrw/ownerdrw.dsp
index 5ae3747da43aec641ca47a0fa996d9e92fca1fa6..25e6771c50680398d778fed5a336626d90422db7 100644 (file)
--- a/samples/ownerdrw/ownerdrw.dsp
+++ b/samples/ownerdrw/ownerdrw.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\ownerdrw"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\ownerdrw"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\ownerdrw"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\ownerdrw"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj
index ebd1a64a5d8e646c28619cd19d18e97940da5e90..1ee00e452ca3029008b80ade2825be4fe65e6386 100644 (file)
--- a/samples/ownerdrw/ownerdrw_vc7.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/ownerdrw/ownerdrw_vc8.vcproj b/samples/ownerdrw/ownerdrw_vc8.vcproj
index f291d877a9d50e9737c36d3dd852f7a48a8cc421..8d01792406ad45fed9cd7d5b578570f4240fe41e 100644 (file)
--- a/samples/ownerdrw/ownerdrw_vc8.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ownerdrw/ownerdrw_vc9.vcproj b/samples/ownerdrw/ownerdrw_vc9.vcproj
index 6fa4fcd1709f27b33ef08e0ee5f8912edbcb9b2b..b7a462f59dc3b885a6a85383d24364d6db64cffc 100644 (file)
--- a/samples/ownerdrw/ownerdrw_vc9.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ownerdrw.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index a656c590e673228c86e6c2d03abb6b95b1733624..9a4bcec0a754eda2c752213ed2f3b9919eaf4471 100644 (file)
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc
index 9b3d70806edab286ec4f2ea7bef4a7713cde0e06..392b60b429d1b14597f43e4e33cd7608734f5139 100644 (file)
--- a/samples/popup/makefile.bcc
+++ b/samples/popup/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POPUP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-POPUP_OBJECTS =  \\r
-       $(OBJS)\popup_popup.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\popup.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe\r
-       -if exist $(OBJS)\popup.tds del $(OBJS)\popup.tds\r
-       -if exist $(OBJS)\popup.ilc del $(OBJS)\popup.ilc\r
-       -if exist $(OBJS)\popup.ild del $(OBJS)\popup.ild\r
-       -if exist $(OBJS)\popup.ilf del $(OBJS)\popup.ilf\r
-       -if exist $(OBJS)\popup.ils del $(OBJS)\popup.ils\r
-\r
-$(OBJS)\popup.exe: $(POPUP_OBJECTS)  $(OBJS)\popup_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(POPUP_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\popup_sample.res\r
-|\r
-\r
-$(OBJS)\popup_popup.obj: .\popup.cpp\r
-       $(CXX) -q -c -P -o$@ $(POPUP_CXXFLAGS) .\popup.cpp\r
-\r
-$(OBJS)\popup_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POPUP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+POPUP_OBJECTS =  \
+       $(OBJS)\popup_popup.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\popup.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
+       -if exist $(OBJS)\popup.tds del $(OBJS)\popup.tds
+       -if exist $(OBJS)\popup.ilc del $(OBJS)\popup.ilc
+       -if exist $(OBJS)\popup.ild del $(OBJS)\popup.ild
+       -if exist $(OBJS)\popup.ilf del $(OBJS)\popup.ilf
+       -if exist $(OBJS)\popup.ils del $(OBJS)\popup.ils
+
+$(OBJS)\popup.exe: $(POPUP_OBJECTS)  $(OBJS)\popup_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(POPUP_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\popup_sample.res
+|
+
+$(OBJS)\popup_popup.obj: .\popup.cpp
+       $(CXX) -q -c -P -o$@ $(POPUP_CXXFLAGS) .\popup.cpp
+
+$(OBJS)\popup_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc
index 32704657992876db61f6d524d89b77c0fb0d197f..58e28204712d3cb200bf688e5cc158686a2eef9a 100644 (file)
--- a/samples/popup/makefile.gcc
+++ b/samples/popup/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POPUP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-POPUP_OBJECTS =  \\r
-       $(OBJS)\popup_popup.o \\r
-       $(OBJS)\popup_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\popup.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe\r
-\r
-$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o\r
-       $(CXX) -o $@ $(POPUP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\popup_popup.o: ./popup.cpp\r
-       $(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\popup_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POPUP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+POPUP_OBJECTS =  \
+       $(OBJS)\popup_popup.o \
+       $(OBJS)\popup_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\popup.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
+
+$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o
+       $(CXX) -o $@ $(POPUP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\popup_popup.o: ./popup.cpp
+       $(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\popup_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx
index 517051e3e099dca03b47dc1b7572e666692346d1..f6c7617c202f5c8843e66f11b8c279991c17acc0 100644 (file)
--- a/samples/popup/makefile.unx
+++ b/samples/popup/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc
index d908cc7bef803732a8e79752b14c5bdd18c95a26..a7f917b0a1ec66b14c7d17e517aead72b2637a10 100644 (file)
--- a/samples/popup/makefile.vc
+++ b/samples/popup/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POPUP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-POPUP_OBJECTS =  \\r
-       $(OBJS)\popup_popup.obj \\r
-       $(OBJS)\popup_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\popup.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe\r
-       -if exist $(OBJS)\popup.ilk del $(OBJS)\popup.ilk\r
-       -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb\r
-\r
-$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(POPUP_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\popup_popup.obj: .\popup.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) .\popup.cpp\r
-\r
-$(OBJS)\popup_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POPUP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+POPUP_OBJECTS =  \
+       $(OBJS)\popup_popup.obj
+POPUP_RESOURCES =  \
+       $(OBJS)\popup_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\popup.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
+       -if exist $(OBJS)\popup.ilk del $(OBJS)\popup.ilk
+       -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb
+
+$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(POPUP_OBJECTS) $(POPUP_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\popup_popup.obj: .\popup.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) .\popup.cpp
+
+$(OBJS)\popup_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat
index c2c3ae95e7b0649a7487afdc4adad158fca9467d..374209bca35e5f5bcfd64b186383b21d5d4bc912 100644 (file)
--- a/samples/popup/makefile.wat
+++ b/samples/popup/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POPUP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-POPUP_OBJECTS =  &\r
-       $(OBJS)\popup_popup.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\popup.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe\r
-\r
-$(OBJS)\popup.exe :  $(POPUP_OBJECTS) $(OBJS)\popup_sample.res\r
-       @%create $(OBJS)\popup.lbc\r
-       @%append $(OBJS)\popup.lbc option quiet\r
-       @%append $(OBJS)\popup.lbc name $^@\r
-       @%append $(OBJS)\popup.lbc option caseexact\r
-       @%append $(OBJS)\popup.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\popup.lbc library %i\r
-       @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res\r
-       @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i\r
-       wlink @$(OBJS)\popup.lbc\r
-\r
-$(OBJS)\popup_popup.obj :  .AUTODEPEND .\popup.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(POPUP_CXXFLAGS) $<\r
-\r
-$(OBJS)\popup_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POPUP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+POPUP_OBJECTS =  &
+       $(OBJS)\popup_popup.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\popup.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
+
+$(OBJS)\popup.exe :  $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
+       @%create $(OBJS)\popup.lbc
+       @%append $(OBJS)\popup.lbc option quiet
+       @%append $(OBJS)\popup.lbc name $^@
+       @%append $(OBJS)\popup.lbc option caseexact
+       @%append $(OBJS)\popup.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\popup.lbc library %i
+       @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res
+       @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i
+       wlink @$(OBJS)\popup.lbc
+
+$(OBJS)\popup_popup.obj :  .AUTODEPEND .\popup.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(POPUP_CXXFLAGS) $<
+
+$(OBJS)\popup_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/popup/popup.dsp b/samples/popup/popup.dsp
index 6f9a083e1161d014683272ef512098b5fe5b5ec1..06e1ee0e9d338f00377c7f371f1f2933b7dd915a 100644 (file)
--- a/samples/popup/popup.dsp
+++ b/samples/popup/popup.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\popup"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\popup"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\popup"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\popup"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/popup/popup_vc7.vcproj b/samples/popup/popup_vc7.vcproj
index 8f4e8ed75b693d19b9a603bea08a74c5bbbba3d7..a23a122ebbc075bbd87c6dd2c0224179974e24aa 100644 (file)
--- a/samples/popup/popup_vc7.vcproj
+++ b/samples/popup/popup_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\popup.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\popup.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\popup.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\popup.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/popup/popup_vc8.vcproj b/samples/popup/popup_vc8.vcproj
index 7256447397ef58b11ee78a2b92c82f649a208529..5beda0576554f51b713d68346842fe81b041406b 100644 (file)
--- a/samples/popup/popup_vc8.vcproj
+++ b/samples/popup/popup_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/popup/popup_vc9.vcproj b/samples/popup/popup_vc9.vcproj
index 9176e75f7fd853b0a756fed2ba1782fbe767cab9..bd3e47f93fac235d11556cf413fb953de41190f4 100644 (file)
--- a/samples/popup/popup_vc9.vcproj
+++ b/samples/popup/popup_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\popup.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\popup.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index f93641876095f79d9b8fd783c9704bf17e3caa80..a38b9dbbf6624a166691344eec1b2467ac0c68cf 100644 (file)
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc
index 18712dfaaba53e3cd88ab45cd1dc3112aa41e26f..94abb8a6f58b62ddcf27d0ebb91bf08a29ae0ffe 100644 (file)
--- a/samples/power/makefile.bcc
+++ b/samples/power/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POWER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-POWER_OBJECTS =  \\r
-       $(OBJS)\power_power.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\power.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe\r
-       -if exist $(OBJS)\power.tds del $(OBJS)\power.tds\r
-       -if exist $(OBJS)\power.ilc del $(OBJS)\power.ilc\r
-       -if exist $(OBJS)\power.ild del $(OBJS)\power.ild\r
-       -if exist $(OBJS)\power.ilf del $(OBJS)\power.ilf\r
-       -if exist $(OBJS)\power.ils del $(OBJS)\power.ils\r
-\r
-$(OBJS)\power.exe: $(POWER_OBJECTS)  $(OBJS)\power_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res\r
-|\r
-\r
-$(OBJS)\power_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\power_power.obj: .\power.cpp\r
-       $(CXX) -q -c -P -o$@ $(POWER_CXXFLAGS) .\power.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+       $(OBJS)\power_power.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+       -if exist $(OBJS)\power.tds del $(OBJS)\power.tds
+       -if exist $(OBJS)\power.ilc del $(OBJS)\power.ilc
+       -if exist $(OBJS)\power.ild del $(OBJS)\power.ild
+       -if exist $(OBJS)\power.ilf del $(OBJS)\power.ilf
+       -if exist $(OBJS)\power.ils del $(OBJS)\power.ils
+
+$(OBJS)\power.exe: $(POWER_OBJECTS)  $(OBJS)\power_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res
+|
+
+$(OBJS)\power_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\power_power.obj: .\power.cpp
+       $(CXX) -q -c -P -o$@ $(POWER_CXXFLAGS) .\power.cpp
+

diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
index 8afde5723d2052a6bc7b9d5917c52450a207616c..0228aba22ae46d8e42ef86e20f0d620a22c3ed1c 100644 (file)
--- a/samples/power/makefile.gcc
+++ b/samples/power/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POWER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-POWER_OBJECTS =  \\r
-       $(OBJS)\power_sample_rc.o \\r
-       $(OBJS)\power_power.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\power.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe\r
-\r
-$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o\r
-       $(CXX) -o $@ $(POWER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\power_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\power_power.o: ./power.cpp\r
-       $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+       $(OBJS)\power_sample_rc.o \
+       $(OBJS)\power_power.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+
+$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o
+       $(CXX) -o $@ $(POWER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\power_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\power_power.o: ./power.cpp
+       $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx
index d57da832fabe16f6681683bfb19d7d6f0ae7aca9..7faee9b9feaca6c9ee06946aa50dbb441c8379dd 100644 (file)
--- a/samples/power/makefile.unx
+++ b/samples/power/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
index de6b7ab1608019aa8215d3f932ef40e4c31b1855..94a19f9963af4c617a59e3634562836b66e90ed6 100644 (file)
--- a/samples/power/makefile.vc
+++ b/samples/power/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-POWER_OBJECTS =  \\r
-       $(OBJS)\power_sample.res \\r
-       $(OBJS)\power_power.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\power.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe\r
-       -if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk\r
-       -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb\r
-\r
-$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(POWER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\power_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\power_power.obj: .\power.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) .\power.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+       $(OBJS)\power_power.obj
+POWER_RESOURCES =  \
+       $(OBJS)\power_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\power.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+       -if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk
+       -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb
+
+$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(POWER_OBJECTS) $(POWER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\power_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\power_power.obj: .\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) .\power.cpp
+

diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat
index bf3e19a392beb39d59769244f1426c59e1a5bdc1..19210015476eb080aa1a3538003479f0370548a6 100644 (file)
--- a/samples/power/makefile.wat
+++ b/samples/power/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-POWER_OBJECTS =  &\r
-       $(OBJS)\power_power.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\power.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe\r
-\r
-$(OBJS)\power.exe :  $(POWER_OBJECTS) $(OBJS)\power_sample.res\r
-       @%create $(OBJS)\power.lbc\r
-       @%append $(OBJS)\power.lbc option quiet\r
-       @%append $(OBJS)\power.lbc name $^@\r
-       @%append $(OBJS)\power.lbc option caseexact\r
-       @%append $(OBJS)\power.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\power.lbc library %i\r
-       @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res\r
-       @for %i in () do @%append $(OBJS)\power.lbc option stack=%i\r
-       wlink @$(OBJS)\power.lbc\r
-\r
-$(OBJS)\power_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\power_power.obj :  .AUTODEPEND .\power.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+POWER_OBJECTS =  &
+       $(OBJS)\power_power.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\power.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\power.exe del $(OBJS)\power.exe
+
+$(OBJS)\power.exe :  $(POWER_OBJECTS) $(OBJS)\power_sample.res
+       @%create $(OBJS)\power.lbc
+       @%append $(OBJS)\power.lbc option quiet
+       @%append $(OBJS)\power.lbc name $^@
+       @%append $(OBJS)\power.lbc option caseexact
+       @%append $(OBJS)\power.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\power.lbc library %i
+       @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res
+       @for %i in () do @%append $(OBJS)\power.lbc option stack=%i
+       wlink @$(OBJS)\power.lbc
+
+$(OBJS)\power_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\power_power.obj :  .AUTODEPEND .\power.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $<
+

diff --git a/samples/power/power.dsp b/samples/power/power.dsp
index 6fc86e69afb6d2c6d2064f05d560d2e3aebac4bf..ea49c06b96cb84a56bb395c9d9597a64a8724626 100644 (file)
--- a/samples/power/power.dsp
+++ b/samples/power/power.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\power"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\power"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\power"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\power"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/power/power_vc7.vcproj b/samples/power/power_vc7.vcproj
index 3784598c75de497801b50303236a5459b7848553..93aec9723fbc5b791b2cafc7efbe918df3fc857b 100644 (file)
--- a/samples/power/power_vc7.vcproj
+++ b/samples/power/power_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\power.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\power.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\power.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\power.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/power/power_vc8.vcproj b/samples/power/power_vc8.vcproj
index 4134025d306acaf6d64bb91ec17442c5638eeed2..f93994eb9b229bd845c43d4ccee0cc1940f870bb 100644 (file)
--- a/samples/power/power_vc8.vcproj
+++ b/samples/power/power_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/power/power_vc9.vcproj b/samples/power/power_vc9.vcproj
index 3dd628b390afb0e2fc591c6c244bab9d25193d4e..92ff88d59c9212531ef8515599e34f79bcaa83c7 100644 (file)
--- a/samples/power/power_vc9.vcproj
+++ b/samples/power/power_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\power.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\power.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index ee95af20593963b52c01ece929d6d899d39df196..8e13e86cbbe0692c27c627a383eae625eaa31420 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index 45286c1ab06e6813e8b7451c3ef5aee60e417503..b0f4ddfe4ecff7a264cf67f815ddf2efad3499b3 100644 (file)
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-PRINTING_OBJECTS =  \\r
-       $(OBJS)\printing_printing.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\printing.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
-       -if exist $(OBJS)\printing.tds del $(OBJS)\printing.tds\r
-       -if exist $(OBJS)\printing.ilc del $(OBJS)\printing.ilc\r
-       -if exist $(OBJS)\printing.ild del $(OBJS)\printing.ild\r
-       -if exist $(OBJS)\printing.ilf del $(OBJS)\printing.ilf\r
-       -if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils\r
-\r
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS)  $(OBJS)\printing_printing.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_printing.res\r
-|\r
-\r
-$(OBJS)\printing_printing.obj: .\printing.cpp\r
-       $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
-\r
-$(OBJS)\printing_printing.res: .\printing.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\printing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+PRINTING_OBJECTS =  \
+       $(OBJS)\printing_printing.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\printing.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
+       -if exist $(OBJS)\printing.tds del $(OBJS)\printing.tds
+       -if exist $(OBJS)\printing.ilc del $(OBJS)\printing.ilc
+       -if exist $(OBJS)\printing.ild del $(OBJS)\printing.ild
+       -if exist $(OBJS)\printing.ilf del $(OBJS)\printing.ilf
+       -if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils
+
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS)  $(OBJS)\printing_printing.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_printing.res
+|
+
+$(OBJS)\printing_printing.obj: .\printing.cpp
+       $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) .\printing.cpp
+
+$(OBJS)\printing_printing.res: .\printing.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\printing.rc
+

diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index 860595d55d973e5b6e4b7cf0fe6fd27078474d51..eaaea1bc5a85ac82ab1695fd6e7d83935ab1616f 100644 (file)
--- a/samples/printing/makefile.gcc
+++ b/samples/printing/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-PRINTING_OBJECTS =  \\r
-       $(OBJS)\printing_printing.o \\r
-       $(OBJS)\printing_printing_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\printing.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
-\r
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o\r
-       $(CXX) -o $@ $(PRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\printing_printing.o: ./printing.cpp\r
-       $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\printing_printing_rc.o: ./printing.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+PRINTING_OBJECTS =  \
+       $(OBJS)\printing_printing.o \
+       $(OBJS)\printing_printing_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\printing.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
+
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o
+       $(CXX) -o $@ $(PRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\printing_printing.o: ./printing.cpp
+       $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\printing_printing_rc.o: ./printing.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx
index 53cbae184ed1bb285174b426c90d6e907c6218f9..f1bf72f6a410ee78174307b6e80e5448068866ab 100644 (file)
--- a/samples/printing/makefile.unx
+++ b/samples/printing/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index deaf69b83c8836e30e9eec55d99cc5d3b629735c..f9842b665f6fb8278e84324db411da47286138f7 100644 (file)
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-PRINTING_OBJECTS =  \\r
-       $(OBJS)\printing_printing.obj \\r
-       $(OBJS)\printing_printing.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\printing.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
-       -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk\r
-       -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb\r
-\r
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(PRINTING_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\printing_printing.obj: .\printing.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
-\r
-$(OBJS)\printing_printing.res: .\printing.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\printing.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+PRINTING_OBJECTS =  \
+       $(OBJS)\printing_printing.obj
+PRINTING_RESOURCES =  \
+       $(OBJS)\printing_printing.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\printing.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
+       -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk
+       -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb
+
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(PRINTING_OBJECTS) $(PRINTING_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\printing_printing.obj: .\printing.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp
+
+$(OBJS)\printing_printing.res: .\printing.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\printing.rc
+

diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index bdf75f9f8d617609dfd684761778f6421596090c..41721957fff4064191d1aa582f5f29f0dbaf2128 100644 (file)
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-PRINTING_OBJECTS =  &\r
-       $(OBJS)\printing_printing.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\printing.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
-\r
-$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res\r
-       @%create $(OBJS)\printing.lbc\r
-       @%append $(OBJS)\printing.lbc option quiet\r
-       @%append $(OBJS)\printing.lbc name $^@\r
-       @%append $(OBJS)\printing.lbc option caseexact\r
-       @%append $(OBJS)\printing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\printing.lbc library %i\r
-       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res\r
-       @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i\r
-       wlink @$(OBJS)\printing.lbc\r
-\r
-$(OBJS)\printing_printing.obj :  .AUTODEPEND .\printing.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<\r
-\r
-$(OBJS)\printing_printing.res :  .AUTODEPEND .\printing.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+PRINTING_OBJECTS =  &
+       $(OBJS)\printing_printing.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\printing.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
+
+$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
+       @%create $(OBJS)\printing.lbc
+       @%append $(OBJS)\printing.lbc option quiet
+       @%append $(OBJS)\printing.lbc name $^@
+       @%append $(OBJS)\printing.lbc option caseexact
+       @%append $(OBJS)\printing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\printing.lbc library %i
+       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res
+       @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i
+       wlink @$(OBJS)\printing.lbc
+
+$(OBJS)\printing_printing.obj :  .AUTODEPEND .\printing.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<
+
+$(OBJS)\printing_printing.res :  .AUTODEPEND .\printing.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp
index 0b09aa54b1dabdc194c93a6533f3d1295ea26b6b..db3837b9183b0590896d3804d67f6593580b00f6 100644 (file)
--- a/samples/printing/printing.dsp
+++ b/samples/printing/printing.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\printing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\printing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\printing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\printing"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj
index 16803676084b75a0c2476b50e0c9ae05e299504b..6538699f2053bb9d0fe6341b6f25e02fdf743371 100644 (file)
--- a/samples/printing/printing_vc7.vcproj
+++ b/samples/printing/printing_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\printing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\printing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\printing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\printing.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index e0706fdd067d49a49b4ae3f5859060bc9068eea2..e8890a87a7982d17874918ad7df87f30668330c9 100644 (file)
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj
index f9d44b4e70bca59db1a86aac2f306835ccf66c8b..474749f6cd6da377c18c5eedd3a2b662e507cd1d 100644 (file)
--- a/samples/printing/printing_vc9.vcproj
+++ b/samples/printing/printing_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\printing.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\printing.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index 2d19e15a07d9daf2517fda21c55982f2ac2d7e69..899f6035b05ab5289e979660935f94e20641d069 100644 (file)
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc
index 9e6b7fbe8fc7ec0a35a71d48d3a893dbebb633c4..4c998c14d359c07ff19d7461ae8719ced09ff68b 100644 (file)
--- a/samples/propgrid/makefile.bcc
+++ b/samples/propgrid/makefile.bcc
@@ -1,252 +1,252 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PROPGRID_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-PROPGRID_OBJECTS =  \\r
-       $(OBJS)\propgrid_propgrid.obj \\r
-       $(OBJS)\propgrid_propgrid_minimal.obj \\r
-       $(OBJS)\propgrid_sampleprops.obj \\r
-       $(OBJS)\propgrid_tests.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_PROPGRID_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\propgrid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe\r
-       -if exist $(OBJS)\propgrid.tds del $(OBJS)\propgrid.tds\r
-       -if exist $(OBJS)\propgrid.ilc del $(OBJS)\propgrid.ilc\r
-       -if exist $(OBJS)\propgrid.ild del $(OBJS)\propgrid.ild\r
-       -if exist $(OBJS)\propgrid.ilf del $(OBJS)\propgrid.ilf\r
-       -if exist $(OBJS)\propgrid.ils del $(OBJS)\propgrid.ils\r
-\r
-$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS)  $(OBJS)\propgrid_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(PROPGRID_OBJECTS),$@,, $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\propgrid_sample.res\r
-|\r
-\r
-$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp\r
-       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp\r
-\r
-$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp\r
-       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp\r
-\r
-$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp\r
-       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp\r
-\r
-$(OBJS)\propgrid_tests.obj: .\tests.cpp\r
-       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\tests.cpp\r
-\r
-$(OBJS)\propgrid_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+       $(OBJS)\propgrid_propgrid.obj \
+       $(OBJS)\propgrid_propgrid_minimal.obj \
+       $(OBJS)\propgrid_sampleprops.obj \
+       $(OBJS)\propgrid_tests.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_PROPGRID_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\propgrid.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
+       -if exist $(OBJS)\propgrid.tds del $(OBJS)\propgrid.tds
+       -if exist $(OBJS)\propgrid.ilc del $(OBJS)\propgrid.ilc
+       -if exist $(OBJS)\propgrid.ild del $(OBJS)\propgrid.ild
+       -if exist $(OBJS)\propgrid.ilf del $(OBJS)\propgrid.ilf
+       -if exist $(OBJS)\propgrid.ils del $(OBJS)\propgrid.ils
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS)  $(OBJS)\propgrid_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(PROPGRID_OBJECTS),$@,, $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\propgrid_sample.res
+|
+
+$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
+       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp
+
+$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp
+       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp
+
+$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp
+       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp
+
+$(OBJS)\propgrid_tests.obj: .\tests.cpp
+       $(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\tests.cpp
+
+$(OBJS)\propgrid_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc
index 1a0a8a1836cb55074eae17b368c16f49644b746d..03e9a380b5d8c6b417bcc0d955c6d3ca26714230 100644 (file)
--- a/samples/propgrid/makefile.gcc
+++ b/samples/propgrid/makefile.gcc
@@ -1,246 +1,246 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PROPGRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-PROPGRID_OBJECTS =  \\r
-       $(OBJS)\propgrid_propgrid.o \\r
-       $(OBJS)\propgrid_propgrid_minimal.o \\r
-       $(OBJS)\propgrid_sampleprops.o \\r
-       $(OBJS)\propgrid_tests.o \\r
-       $(OBJS)\propgrid_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_PROPGRID_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\propgrid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe\r
-\r
-$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o\r
-       $(CXX) -o $@ $(PROPGRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\propgrid_propgrid.o: ./propgrid.cpp\r
-       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\propgrid_propgrid_minimal.o: ./propgrid_minimal.cpp\r
-       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\propgrid_sampleprops.o: ./sampleprops.cpp\r
-       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\propgrid_tests.o: ./tests.cpp\r
-       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\propgrid_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+       $(OBJS)\propgrid_propgrid.o \
+       $(OBJS)\propgrid_propgrid_minimal.o \
+       $(OBJS)\propgrid_sampleprops.o \
+       $(OBJS)\propgrid_tests.o \
+       $(OBJS)\propgrid_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_PROPGRID_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\propgrid.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o
+       $(CXX) -o $@ $(PROPGRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\propgrid_propgrid.o: ./propgrid.cpp
+       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_propgrid_minimal.o: ./propgrid_minimal.cpp
+       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_sampleprops.o: ./sampleprops.cpp
+       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_tests.o: ./tests.cpp
+       $(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/propgrid/makefile.unx b/samples/propgrid/makefile.unx
index ffe2b96eddf1f3aa3b6d8faff33fba7f9e49c0a2..364e9565512360f7668c3fc6bdac5dcc2d8d1e0f 100644 (file)
--- a/samples/propgrid/makefile.unx
+++ b/samples/propgrid/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc
index d48a290f68bfde07d6db3eea9cb8d54f9b9e8002..64f2baa56e56e418c7fa5d4693cc5b391e365500 100644 (file)
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -1,331 +1,356 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-PROPGRID_OBJECTS =  \\r
-       $(OBJS)\propgrid_propgrid.obj \\r
-       $(OBJS)\propgrid_propgrid_minimal.obj \\r
-       $(OBJS)\propgrid_sampleprops.obj \\r
-       $(OBJS)\propgrid_tests.obj \\r
-       $(OBJS)\propgrid_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_PROPGRID_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\propgrid.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe\r
-       -if exist $(OBJS)\propgrid.ilk del $(OBJS)\propgrid.ilk\r
-       -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb\r
-\r
-$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(PROPGRID_OBJECTS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp\r
-\r
-$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp\r
-\r
-$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp\r
-\r
-$(OBJS)\propgrid_tests.obj: .\tests.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp\r
-\r
-$(OBJS)\propgrid_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+       $(OBJS)\propgrid_propgrid.obj \
+       $(OBJS)\propgrid_propgrid_minimal.obj \
+       $(OBJS)\propgrid_sampleprops.obj \
+       $(OBJS)\propgrid_tests.obj
+PROPGRID_RESOURCES =  \
+       $(OBJS)\propgrid_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_PROPGRID_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\propgrid.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
+       -if exist $(OBJS)\propgrid.ilk del $(OBJS)\propgrid.ilk
+       -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(PROPGRID_OBJECTS) $(PROPGRID_RESOURCES)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp
+
+$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp
+
+$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp
+
+$(OBJS)\propgrid_tests.obj: .\tests.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp
+
+$(OBJS)\propgrid_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat
index 1c6cb222c87c361ebf2dd2a47438e98eb3454e62..6416a78933bb429a1acb2a45a009fe16fe586ea0 100644 (file)
--- a/samples/propgrid/makefile.wat
+++ b/samples/propgrid/makefile.wat
@@ -1,282 +1,282 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_PROPGRID_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_PROPGRID_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-PROPGRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-PROPGRID_OBJECTS =  &\r
-       $(OBJS)\propgrid_propgrid.obj &\r
-       $(OBJS)\propgrid_propgrid_minimal.obj &\r
-       $(OBJS)\propgrid_sampleprops.obj &\r
-       $(OBJS)\propgrid_tests.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\propgrid.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe\r
-\r
-$(OBJS)\propgrid.exe :  $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res\r
-       @%create $(OBJS)\propgrid.lbc\r
-       @%append $(OBJS)\propgrid.lbc option quiet\r
-       @%append $(OBJS)\propgrid.lbc name $^@\r
-       @%append $(OBJS)\propgrid.lbc option caseexact\r
-       @%append $(OBJS)\propgrid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i\r
-       @for %i in ( $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\propgrid.lbc library %i\r
-       @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res\r
-       @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i\r
-       wlink @$(OBJS)\propgrid.lbc\r
-\r
-$(OBJS)\propgrid_propgrid.obj :  .AUTODEPEND .\propgrid.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<\r
-\r
-$(OBJS)\propgrid_propgrid_minimal.obj :  .AUTODEPEND .\propgrid_minimal.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<\r
-\r
-$(OBJS)\propgrid_sampleprops.obj :  .AUTODEPEND .\sampleprops.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<\r
-\r
-$(OBJS)\propgrid_tests.obj :  .AUTODEPEND .\tests.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<\r
-\r
-$(OBJS)\propgrid_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_PROPGRID_p =
+!ifeq MONOLITHIC 0
+__WXLIB_PROPGRID_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+PROPGRID_OBJECTS =  &
+       $(OBJS)\propgrid_propgrid.obj &
+       $(OBJS)\propgrid_propgrid_minimal.obj &
+       $(OBJS)\propgrid_sampleprops.obj &
+       $(OBJS)\propgrid_tests.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\propgrid.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
+
+$(OBJS)\propgrid.exe :  $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
+       @%create $(OBJS)\propgrid.lbc
+       @%append $(OBJS)\propgrid.lbc option quiet
+       @%append $(OBJS)\propgrid.lbc name $^@
+       @%append $(OBJS)\propgrid.lbc option caseexact
+       @%append $(OBJS)\propgrid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i
+       @for %i in ( $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\propgrid.lbc library %i
+       @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res
+       @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i
+       wlink @$(OBJS)\propgrid.lbc
+
+$(OBJS)\propgrid_propgrid.obj :  .AUTODEPEND .\propgrid.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_propgrid_minimal.obj :  .AUTODEPEND .\propgrid_minimal.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_sampleprops.obj :  .AUTODEPEND .\sampleprops.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_tests.obj :  .AUTODEPEND .\tests.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/propgrid/propgrid.dsp b/samples/propgrid/propgrid.dsp
index a29e2ae8178a10c8bdc64004d9b95015db7cb650..db1f6623cbadcdf2c5e3b344c8119c231ef6c981 100644 (file)
--- a/samples/propgrid/propgrid.dsp
+++ b/samples/propgrid/propgrid.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\propgrid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\propgrid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\propgrid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\propgrid"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj
index f18a476b4d572e848fed48424f4a917661e364f4..a53e191a4c8027bbfe06f292b2476826b8083592 100644 (file)
--- a/samples/propgrid/propgrid_vc7.vcproj
+++ b/samples/propgrid/propgrid_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\propgrid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\propgrid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj
index a31fcdbb61f8fe3feaee6e9953a4cb2fecd8c741..c0844b6ac28dc04195aff24de4d1c0d70083a120 100644 (file)
--- a/samples/propgrid/propgrid_vc8.vcproj
+++ b/samples/propgrid/propgrid_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/propgrid/propgrid_vc9.vcproj b/samples/propgrid/propgrid_vc9.vcproj
index da4ae80ff4c2b1ba03b29a417e6e3c1bc54651b5..6961d3188af06d578858ab94ba5d1ea12c28c098 100644 (file)
--- a/samples/propgrid/propgrid_vc9.vcproj
+++ b/samples/propgrid/propgrid_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\propgrid.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index dc68ca1de1c27abb167d76ca021c20652f73a99f..188497714c3e144fb418427e0aacfbdd8bf5ac81 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc
index ee1f5c505caebbbc7c6dc4f0010f900c451fc9d1..c773f465f184437edce7f605423476c0f8ad538e 100644 (file)
--- a/samples/regtest/makefile.bcc
+++ b/samples/regtest/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-REGTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-REGTEST_OBJECTS =  \\r
-       $(OBJS)\regtest_regtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\regtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe\r
-       -if exist $(OBJS)\regtest.tds del $(OBJS)\regtest.tds\r
-       -if exist $(OBJS)\regtest.ilc del $(OBJS)\regtest.ilc\r
-       -if exist $(OBJS)\regtest.ild del $(OBJS)\regtest.ild\r
-       -if exist $(OBJS)\regtest.ilf del $(OBJS)\regtest.ilf\r
-       -if exist $(OBJS)\regtest.ils del $(OBJS)\regtest.ils\r
-\r
-$(OBJS)\regtest.exe: $(REGTEST_OBJECTS)  $(OBJS)\regtest_regtest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(REGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\regtest_regtest.res\r
-|\r
-\r
-$(OBJS)\regtest_regtest.obj: .\regtest.cpp\r
-       $(CXX) -q -c -P -o$@ $(REGTEST_CXXFLAGS) .\regtest.cpp\r
-\r
-$(OBJS)\regtest_regtest.res: .\regtest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\regtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+REGTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+REGTEST_OBJECTS =  \
+       $(OBJS)\regtest_regtest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\regtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
+       -if exist $(OBJS)\regtest.tds del $(OBJS)\regtest.tds
+       -if exist $(OBJS)\regtest.ilc del $(OBJS)\regtest.ilc
+       -if exist $(OBJS)\regtest.ild del $(OBJS)\regtest.ild
+       -if exist $(OBJS)\regtest.ilf del $(OBJS)\regtest.ilf
+       -if exist $(OBJS)\regtest.ils del $(OBJS)\regtest.ils
+
+$(OBJS)\regtest.exe: $(REGTEST_OBJECTS)  $(OBJS)\regtest_regtest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(REGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\regtest_regtest.res
+|
+
+$(OBJS)\regtest_regtest.obj: .\regtest.cpp
+       $(CXX) -q -c -P -o$@ $(REGTEST_CXXFLAGS) .\regtest.cpp
+
+$(OBJS)\regtest_regtest.res: .\regtest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\regtest.rc
+

diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc
index 7d86a9b0978edbcac361724a2501a77e4abeca83..a6a0141b6d8bcc7e44db7ae607762450f3735e09 100644 (file)
--- a/samples/regtest/makefile.gcc
+++ b/samples/regtest/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-REGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-REGTEST_OBJECTS =  \\r
-       $(OBJS)\regtest_regtest.o \\r
-       $(OBJS)\regtest_regtest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\regtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe\r
-\r
-$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest_rc.o\r
-       $(CXX) -o $@ $(REGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\regtest_regtest.o: ./regtest.cpp\r
-       $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\regtest_regtest_rc.o: ./regtest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+REGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+REGTEST_OBJECTS =  \
+       $(OBJS)\regtest_regtest.o \
+       $(OBJS)\regtest_regtest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\regtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
+
+$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest_rc.o
+       $(CXX) -o $@ $(REGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\regtest_regtest.o: ./regtest.cpp
+       $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\regtest_regtest_rc.o: ./regtest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx
index e4d8be79ced023eefd6cc3ab908889d366f33974..fc700cf736d96164edf20a00de9c7314047e9c1d 100644 (file)
--- a/samples/regtest/makefile.unx
+++ b/samples/regtest/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index 456dd63ff42fb66b68405849fefe1d75d0bcc19d..bcb840f7f9666cd3561a0c3d943c6cd2035e9646 100644 (file)
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-REGTEST_OBJECTS =  \\r
-       $(OBJS)\regtest_regtest.obj \\r
-       $(OBJS)\regtest_regtest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\regtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe\r
-       -if exist $(OBJS)\regtest.ilk del $(OBJS)\regtest.ilk\r
-       -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb\r
-\r
-$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(REGTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\regtest_regtest.obj: .\regtest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp\r
-\r
-$(OBJS)\regtest_regtest.res: .\regtest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\regtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+REGTEST_OBJECTS =  \
+       $(OBJS)\regtest_regtest.obj
+REGTEST_RESOURCES =  \
+       $(OBJS)\regtest_regtest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\regtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
+       -if exist $(OBJS)\regtest.ilk del $(OBJS)\regtest.ilk
+       -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb
+
+$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(REGTEST_OBJECTS) $(REGTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\regtest_regtest.obj: .\regtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp
+
+$(OBJS)\regtest_regtest.res: .\regtest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\regtest.rc
+

diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat
index f1dfed752be1f50feb1e90e76628bb10e3c18817..41664d2fcf5a43a2c16f248bd3feedb09e00bdc4 100644 (file)
--- a/samples/regtest/makefile.wat
+++ b/samples/regtest/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-REGTEST_OBJECTS =  &\r
-       $(OBJS)\regtest_regtest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\regtest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe\r
-\r
-$(OBJS)\regtest.exe :  $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res\r
-       @%create $(OBJS)\regtest.lbc\r
-       @%append $(OBJS)\regtest.lbc option quiet\r
-       @%append $(OBJS)\regtest.lbc name $^@\r
-       @%append $(OBJS)\regtest.lbc option caseexact\r
-       @%append $(OBJS)\regtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\regtest.lbc library %i\r
-       @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res\r
-       @for %i in () do @%append $(OBJS)\regtest.lbc option stack=%i\r
-       wlink @$(OBJS)\regtest.lbc\r
-\r
-$(OBJS)\regtest_regtest.obj :  .AUTODEPEND .\regtest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(REGTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\regtest_regtest.res :  .AUTODEPEND .\regtest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+REGTEST_OBJECTS =  &
+       $(OBJS)\regtest_regtest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\regtest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
+
+$(OBJS)\regtest.exe :  $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res
+       @%create $(OBJS)\regtest.lbc
+       @%append $(OBJS)\regtest.lbc option quiet
+       @%append $(OBJS)\regtest.lbc name $^@
+       @%append $(OBJS)\regtest.lbc option caseexact
+       @%append $(OBJS)\regtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\regtest.lbc library %i
+       @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res
+       @for %i in () do @%append $(OBJS)\regtest.lbc option stack=%i
+       wlink @$(OBJS)\regtest.lbc
+
+$(OBJS)\regtest_regtest.obj :  .AUTODEPEND .\regtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(REGTEST_CXXFLAGS) $<
+
+$(OBJS)\regtest_regtest.res :  .AUTODEPEND .\regtest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/regtest/regtest.dsp b/samples/regtest/regtest.dsp
index 12f28aa31989d075439920df982952dd70bc7d60..bd947191c2a653a6e409ac777889f6539fcd717d 100644 (file)
--- a/samples/regtest/regtest.dsp
+++ b/samples/regtest/regtest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\regtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\regtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\regtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\regtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/regtest/regtest_vc7.vcproj b/samples/regtest/regtest_vc7.vcproj
index fccd4fc869010c967bb324d8518ec6be3bccf429..effe2948fe022232ebdf4c10712b479a2e9b9c8c 100644 (file)
--- a/samples/regtest/regtest_vc7.vcproj
+++ b/samples/regtest/regtest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\regtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\regtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\regtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\regtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/regtest/regtest_vc8.vcproj b/samples/regtest/regtest_vc8.vcproj
index 51c16500af0f26d4c2a379077b75c79482cbad37..8fc538399ed3a6dab63ebc6f3b4910727b995413 100644 (file)
--- a/samples/regtest/regtest_vc8.vcproj
+++ b/samples/regtest/regtest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/regtest/regtest_vc9.vcproj b/samples/regtest/regtest_vc9.vcproj
index d3d4b3a170920eed07365366331810448c5ed20e..409a29942d196d83896403f327424bd605a9e5ec 100644 (file)
--- a/samples/regtest/regtest_vc9.vcproj
+++ b/samples/regtest/regtest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\regtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\regtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 04bca06671d7e818423c8056e753ab001ce2964f..9b37bc73db3db943924298bab9f2ea87bbfb8678 100644 (file)
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index 66839f41fa11cd40c1389232506f24d7746256e4..13e667cdc397eab51c656152ce1af0311ad40621 100644 (file)
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -1,261 +1,261 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RENDER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-RENDER_OBJECTS =  \\r
-       $(OBJS)\render_render.obj\r
-RENDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -DWXUSINGDLL \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-RENDDLL_OBJECTS =  \\r
-       $(OBJS)\renddll_renddll.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__renddll___depname = \\r
-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_0 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_0 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_0 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_0 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\render.exe $(__renddll___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
-       -if exist $(OBJS)\render.tds del $(OBJS)\render.tds\r
-       -if exist $(OBJS)\render.ilc del $(OBJS)\render.ilc\r
-       -if exist $(OBJS)\render.ild del $(OBJS)\render.ild\r
-       -if exist $(OBJS)\render.ilf del $(OBJS)\render.ilf\r
-       -if exist $(OBJS)\render.ils del $(OBJS)\render.ils\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.tds del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.tds\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilc del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilc\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ild del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ild\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilf del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilf\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ils\r
-\r
-$(OBJS)\render.exe: $(RENDER_OBJECTS)  $(OBJS)\render_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res\r
-|\r
-\r
-!if "$(SHARED)" == "1"\r
-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll: $(RENDDLL_OBJECTS)\r
-       ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(LDFLAGS) @&&|\r
-       c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,\r
-|\r
-!endif\r
-\r
-$(OBJS)\render_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\render_render.obj: .\render.cpp\r
-       $(CXX) -q -c -P -o$@ $(RENDER_CXXFLAGS) .\render.cpp\r
-\r
-$(OBJS)\renddll_renddll.obj: .\renddll.cpp\r
-       $(CXX) -q -c -P -o$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RENDER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+RENDER_OBJECTS =  \
+       $(OBJS)\render_render.obj
+RENDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -DWXUSINGDLL \
+       $(CPPFLAGS) $(CXXFLAGS)
+RENDDLL_OBJECTS =  \
+       $(OBJS)\renddll_renddll.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__renddll___depname = \
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_0 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_0 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_0 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_0 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\render.exe $(__renddll___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe
+       -if exist $(OBJS)\render.tds del $(OBJS)\render.tds
+       -if exist $(OBJS)\render.ilc del $(OBJS)\render.ilc
+       -if exist $(OBJS)\render.ild del $(OBJS)\render.ild
+       -if exist $(OBJS)\render.ilf del $(OBJS)\render.ilf
+       -if exist $(OBJS)\render.ils del $(OBJS)\render.ils
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.tds del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.tds
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilc del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilc
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ild del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ild
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilf del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ilf
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.ils
+
+$(OBJS)\render.exe: $(RENDER_OBJECTS)  $(OBJS)\render_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res
+|
+
+!if "$(SHARED)" == "1"
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_bcc.dll: $(RENDDLL_OBJECTS)
+       ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(LDFLAGS) @&&|
+       c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
+|
+!endif
+
+$(OBJS)\render_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\render_render.obj: .\render.cpp
+       $(CXX) -q -c -P -o$@ $(RENDER_CXXFLAGS) .\render.cpp
+
+$(OBJS)\renddll_renddll.obj: .\renddll.cpp
+       $(CXX) -q -c -P -o$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp
+

diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index 0515d496d046ee90e894528c0e41abaaa91fc859..1bbd85a7ed9ad42dc315f6c9226f9055068930f8 100644 (file)
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -1,249 +1,249 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-RENDER_OBJECTS =  \\r
-       $(OBJS)\render_sample_rc.o \\r
-       $(OBJS)\render_render.o\r
-RENDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -DWXUSINGDLL \\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-RENDDLL_OBJECTS =  \\r
-       $(OBJS)\renddll_renddll.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__renddll___depname = \\r
-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\render.exe $(__renddll___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll\r
-\r
-$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o\r
-       $(CXX) -o $@ $(RENDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-ifeq ($(SHARED),1)\r
-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll: $(RENDDLL_OBJECTS)\r
-       $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\render_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\render_render.o: ./render.cpp\r
-       $(CXX) -c -o $@ $(RENDER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\renddll_renddll.o: ./renddll.cpp\r
-       $(CXX) -c -o $@ $(RENDDLL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+RENDER_OBJECTS =  \
+       $(OBJS)\render_sample_rc.o \
+       $(OBJS)\render_render.o
+RENDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -DWXUSINGDLL \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+RENDDLL_OBJECTS =  \
+       $(OBJS)\renddll_renddll.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__renddll___depname = \
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\render.exe $(__renddll___depname)
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll
+
+$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o
+       $(CXX) -o $@ $(RENDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+ifeq ($(SHARED),1)
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_gcc.dll: $(RENDDLL_OBJECTS)
+       $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\render_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\render_render.o: ./render.cpp
+       $(CXX) -c -o $@ $(RENDER_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\renddll_renddll.o: ./renddll.cpp
+       $(CXX) -c -o $@ $(RENDDLL_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx
index 4a3e5a695a038e202e343561e6c1a6f21a3a869c..55287809ce27e3c183e7791ca54e7faf570630b1 100644 (file)
--- a/samples/render/makefile.unx
+++ b/samples/render/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index 76f8c65c3ce68f86200fbfe53a751f956a7f5524..b7d66401434162e9dba3706ee2fc391a8a1704c2 100644 (file)
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -1,345 +1,383 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
-       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-RENDER_OBJECTS =  \\r
-       $(OBJS)\render_sample.res \\r
-       $(OBJS)\render_render.obj\r
-RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) \\r
-       /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb \\r
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \\r
-       /DWXUSINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-RENDDLL_OBJECTS =  \\r
-       $(OBJS)\renddll_renddll.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__renddll___depname = \\r
-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_23 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_23 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = T\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\render.exe $(__renddll___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
-       -if exist $(OBJS)\render.ilk del $(OBJS)\render.ilk\r
-       -if exist $(OBJS)\render.pdb del $(OBJS)\render.pdb\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb\r
-\r
-$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(RENDER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-!if "$(SHARED)" == "1"\r
-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS)\r
-       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<\r
-       $(RENDDLL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\render_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\render_render.obj: .\render.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RENDER_CXXFLAGS) .\render.cpp\r
-\r
-$(OBJS)\renddll_renddll.obj: .\renddll.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
+       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+RENDER_OBJECTS =  \
+       $(OBJS)\render_render.obj
+RENDER_RESOURCES =  \
+       $(OBJS)\render_sample.res
+RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb \
+       $(__DEBUGINFO_19) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       /I$(SETUPHDIR) /I.\..\..\include /W4 /DWXUSINGDLL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+RENDDLL_OBJECTS =  \
+       $(OBJS)\renddll_renddll.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__renddll___depname = \
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_19 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_27 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_27 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_0 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\render.exe $(__renddll___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe
+       -if exist $(OBJS)\render.ilk del $(OBJS)\render.ilk
+       -if exist $(OBJS)\render.pdb del $(OBJS)\render.pdb
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb
+
+$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(RENDER_OBJECTS) $(RENDER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+!if "$(SHARED)" == "1"
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RENDDLL_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\render_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\render_render.obj: .\render.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RENDER_CXXFLAGS) .\render.cpp
+
+$(OBJS)\renddll_renddll.obj: .\renddll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp
+

diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index fc8a234b387810eb59f88ddc925fdfb24c332588..6ab7a7b4118c4eaad05b97de551751c8918522ce 100644 (file)
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -1,292 +1,292 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__renddll___depname =\r
-!ifeq SHARED 1\r
-__renddll___depname = &\r
-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll\r
-!endif\r
-__DEBUGINFO =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG = -ot -ox\r
-!endif\r
-__THREADSFLAG =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG = -bm\r
-!endif\r
-__RUNTIME_LIBS =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS = \r
-!endif\r
-__RTTIFLAG =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG = -xr\r
-!endif\r
-__EXCEPTIONSFLAG =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-RENDER_OBJECTS =  &\r
-       $(OBJS)\render_render.obj\r
-RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL &\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-RENDDLL_OBJECTS =  &\r
-       $(OBJS)\renddll_renddll.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\render.exe $(__renddll___depname)\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll\r
-\r
-$(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
-       @%create $(OBJS)\render.lbc\r
-       @%append $(OBJS)\render.lbc option quiet\r
-       @%append $(OBJS)\render.lbc name $^@\r
-       @%append $(OBJS)\render.lbc option caseexact\r
-       @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i\r
-       @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res\r
-       @for %i in () do @%append $(OBJS)\render.lbc option stack=%i\r
-       wlink @$(OBJS)\render.lbc\r
-\r
-!ifeq SHARED 1\r
-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll :  $(RENDDLL_OBJECTS)\r
-       @%create $(OBJS)\renddll.lbc\r
-       @%append $(OBJS)\renddll.lbc option quiet\r
-       @%append $(OBJS)\renddll.lbc name $^@\r
-       @%append $(OBJS)\renddll.lbc option caseexact\r
-       @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(LDFLAGS)\r
-       @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i\r
-       @%append $(OBJS)\renddll.lbc\r
-       @%append $(OBJS)\renddll.lbc system nt_dll\r
-       wlink @$(OBJS)\renddll.lbc\r
-!endif\r
-\r
-$(OBJS)\render_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\render_render.obj :  .AUTODEPEND .\render.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $<\r
-\r
-$(OBJS)\renddll_renddll.obj :  .AUTODEPEND .\renddll.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__renddll___depname =
+!ifeq SHARED 1
+__renddll___depname = &
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll
+!endif
+__DEBUGINFO =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG =
+!ifeq BUILD debug
+__OPTIMIZEFLAG = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG = -ot -ox
+!endif
+__THREADSFLAG =
+!ifeq USE_THREADS 0
+__THREADSFLAG = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG = -bm
+!endif
+__RUNTIME_LIBS =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS = 
+!endif
+__RTTIFLAG =
+!ifeq USE_RTTI 0
+__RTTIFLAG = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG = -xr
+!endif
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+RENDER_OBJECTS =  &
+       $(OBJS)\render_render.obj
+RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+RENDDLL_OBJECTS =  &
+       $(OBJS)\renddll_renddll.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\render.exe $(__renddll___depname)
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\render.exe del $(OBJS)\render.exe
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll
+
+$(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res
+       @%create $(OBJS)\render.lbc
+       @%append $(OBJS)\render.lbc option quiet
+       @%append $(OBJS)\render.lbc name $^@
+       @%append $(OBJS)\render.lbc option caseexact
+       @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i
+       @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res
+       @for %i in () do @%append $(OBJS)\render.lbc option stack=%i
+       wlink @$(OBJS)\render.lbc
+
+!ifeq SHARED 1
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll :  $(RENDDLL_OBJECTS)
+       @%create $(OBJS)\renddll.lbc
+       @%append $(OBJS)\renddll.lbc option quiet
+       @%append $(OBJS)\renddll.lbc name $^@
+       @%append $(OBJS)\renddll.lbc option caseexact
+       @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(LDFLAGS)
+       @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i
+       @%append $(OBJS)\renddll.lbc
+       @%append $(OBJS)\renddll.lbc system nt_dll
+       wlink @$(OBJS)\renddll.lbc
+!endif
+
+$(OBJS)\render_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\render_render.obj :  .AUTODEPEND .\render.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $<
+
+$(OBJS)\renddll_renddll.obj :  .AUTODEPEND .\renddll.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $<
+

diff --git a/samples/render/render_renddll.dsp b/samples/render/render_renddll.dsp
index 027ef8236d78b319ca895ec8e830ed96c96580f3..7f5a634eb7be859f8044adb7ac71ed747fc76f9f 100644 (file)
--- a/samples/render/render_renddll.dsp
+++ b/samples/render/render_renddll.dsp
@@ -43,8 +43,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d WXUSINGDLL\r
@@ -93,8 +93,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d WXUSINGDLL\r

diff --git a/samples/render/render_render.dsp b/samples/render/render_render.dsp
index 79fabdd42830dbeb795c0027de3938b0e5c85656..e5ccf975640efbc13b114d5936980e8754bf0b38 100644 (file)
--- a/samples/render/render_render.dsp
+++ b/samples/render/render_render.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\render"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\render"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\render"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\render"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj
index 24317684a4a1f1c077590430ac7cc7a327a2e07e..268416864f29b5c5dc5c605a767361eaa15221fe 100644 (file)
--- a/samples/render/render_vc7_renddll.vcproj
+++ b/samples/render/render_vc7_renddll.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -109,12 +109,14 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\renddll_mswu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
@@ -234,12 +236,14 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\renddll_mswunivu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu291_vc.pdb"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r

diff --git a/samples/render/render_vc7_render.vcproj b/samples/render/render_vc7_render.vcproj
index 62ec2d18254f474be2387733017f502a80117f2e..c7cdec8332b7a663320aa7f156469ef7c5a26f2d 100644 (file)
--- a/samples/render/render_vc7_render.vcproj
+++ b/samples/render/render_vc7_render.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\render.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\render.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\render.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\render.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj
index 65b8767016bed45dc02a8497abc850aac43a1685..552be7de841090351231436bc708e53c7bbb77a3 100644 (file)
--- a/samples/render/render_vc8_renddll.vcproj
+++ b/samples/render/render_vc8_renddll.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -169,13 +169,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\renddll_mswu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -346,13 +348,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\renddll_mswunivu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu291_vc.pdb"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/render/render_vc8_render.vcproj b/samples/render/render_vc8_render.vcproj
index d0b621ab60e54a21354d2fa12a50562daf33b0b3..bb961ac14b7eceaf1d3129240b2ad0d3d7df30a0 100644 (file)
--- a/samples/render/render_vc8_render.vcproj
+++ b/samples/render/render_vc8_render.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/render/render_vc9_renddll.vcproj b/samples/render/render_vc9_renddll.vcproj
index 689787bacf953c54075f8dc6cf36afd5a474f9a2..af03b9915a22c947271a18c78d77b1483fdb61d9 100644 (file)
--- a/samples/render/render_vc9_renddll.vcproj
+++ b/samples/render/render_vc9_renddll.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"\r
                        />\r
@@ -132,7 +132,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"\r
                        />\r
@@ -168,13 +168,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\renddll_mswu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -219,7 +221,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"\r
                        />\r
@@ -308,7 +310,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"\r
                        />\r
@@ -344,13 +346,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\renddll_mswunivu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu291_vc.pdb"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/render/render_vc9_render.vcproj b/samples/render/render_vc9_render.vcproj
index abd27483e74b0c770efdd85ae665ad39aa8e6ec1..55b205450b24132119277f8fc8d93682e900b6dc 100644 (file)
--- a/samples/render/render_vc9_render.vcproj
+++ b/samples/render/render_vc9_render.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\render.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\render.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in
index 55f0bdc3dda5ee70aae8046a733fd4ca4085f0ba..99c4df52c0ee2e0bce0e39ec06fe160e5bf78e73 100644 (file)
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc
index 5a4ca683f6997a8989a5559c4d35861cecf0f902..36321d9032b99321792976f977ef26e54214c72c 100644 (file)
--- a/samples/ribbon/makefile.bcc
+++ b/samples/ribbon/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RIBBON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-RIBBON_OBJECTS =  \\r
-       $(OBJS)\ribbon_ribbondemo.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RIBBON_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ribbon.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe\r
-       -if exist $(OBJS)\ribbon.tds del $(OBJS)\ribbon.tds\r
-       -if exist $(OBJS)\ribbon.ilc del $(OBJS)\ribbon.ilc\r
-       -if exist $(OBJS)\ribbon.ild del $(OBJS)\ribbon.ild\r
-       -if exist $(OBJS)\ribbon.ilf del $(OBJS)\ribbon.ilf\r
-       -if exist $(OBJS)\ribbon.ils del $(OBJS)\ribbon.ils\r
-\r
-$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS)  $(OBJS)\ribbon_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(RIBBON_OBJECTS),$@,, $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ribbon_sample.res\r
-|\r
-\r
-$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp\r
-       $(CXX) -q -c -P -o$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp\r
-\r
-$(OBJS)\ribbon_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RIBBON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+RIBBON_OBJECTS =  \
+       $(OBJS)\ribbon_ribbondemo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RIBBON_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ribbon.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe
+       -if exist $(OBJS)\ribbon.tds del $(OBJS)\ribbon.tds
+       -if exist $(OBJS)\ribbon.ilc del $(OBJS)\ribbon.ilc
+       -if exist $(OBJS)\ribbon.ild del $(OBJS)\ribbon.ild
+       -if exist $(OBJS)\ribbon.ilf del $(OBJS)\ribbon.ilf
+       -if exist $(OBJS)\ribbon.ils del $(OBJS)\ribbon.ils
+
+$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS)  $(OBJS)\ribbon_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(RIBBON_OBJECTS),$@,, $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ribbon_sample.res
+|
+
+$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp
+       $(CXX) -q -c -P -o$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp
+
+$(OBJS)\ribbon_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc
index 925cba1e65042f449bbb8a1dc79a461cf9b5769a..1308d14f8acce0797b4f5aa48c4a1d006d707ebf 100644 (file)
--- a/samples/ribbon/makefile.gcc
+++ b/samples/ribbon/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RIBBON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-RIBBON_OBJECTS =  \\r
-       $(OBJS)\ribbon_ribbondemo.o \\r
-       $(OBJS)\ribbon_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_RIBBON_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ribbon.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe\r
-\r
-$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample_rc.o\r
-       $(CXX) -o $@ $(RIBBON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\ribbon_ribbondemo.o: ./ribbondemo.cpp\r
-       $(CXX) -c -o $@ $(RIBBON_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\ribbon_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RIBBON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+RIBBON_OBJECTS =  \
+       $(OBJS)\ribbon_ribbondemo.o \
+       $(OBJS)\ribbon_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_RIBBON_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ribbon.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe
+
+$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample_rc.o
+       $(CXX) -o $@ $(RIBBON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\ribbon_ribbondemo.o: ./ribbondemo.cpp
+       $(CXX) -c -o $@ $(RIBBON_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ribbon_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/ribbon/makefile.unx b/samples/ribbon/makefile.unx
index 6435938af11fdc58a29c621a5b61749ee8817d22..75c6ae4addfb8da883d58927e94898fcf2819f1f 100644 (file)
--- a/samples/ribbon/makefile.unx
+++ b/samples/ribbon/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc
index 20ee6aa214f8512066a403609ad8ef394b5b9dc9..d5fff9f8567282a8abdfb4f168f5501ac9129c0d 100644 (file)
--- a/samples/ribbon/makefile.vc
+++ b/samples/ribbon/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RIBBON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-RIBBON_OBJECTS =  \\r
-       $(OBJS)\ribbon_ribbondemo.obj \\r
-       $(OBJS)\ribbon_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RIBBON_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ribbon.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe\r
-       -if exist $(OBJS)\ribbon.ilk del $(OBJS)\ribbon.ilk\r
-       -if exist $(OBJS)\ribbon.pdb del $(OBJS)\ribbon.pdb\r
-\r
-$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(RIBBON_OBJECTS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp\r
-\r
-$(OBJS)\ribbon_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RIBBON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+RIBBON_OBJECTS =  \
+       $(OBJS)\ribbon_ribbondemo.obj
+RIBBON_RESOURCES =  \
+       $(OBJS)\ribbon_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RIBBON_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ribbon.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe
+       -if exist $(OBJS)\ribbon.ilk del $(OBJS)\ribbon.ilk
+       -if exist $(OBJS)\ribbon.pdb del $(OBJS)\ribbon.pdb
+
+$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(RIBBON_OBJECTS) $(RIBBON_RESOURCES)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp
+
+$(OBJS)\ribbon_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat
index bd911ba2e135ce9c341f40cacf03e4cc3ca2cd2e..c238cc036cec93a1fa54446743c9c2701babe1ee 100644 (file)
--- a/samples/ribbon/makefile.wat
+++ b/samples/ribbon/makefile.wat
@@ -1,270 +1,270 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_RIBBON_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_RIBBON_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-RIBBON_OBJECTS =  &\r
-       $(OBJS)\ribbon_ribbondemo.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\ribbon.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe\r
-\r
-$(OBJS)\ribbon.exe :  $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res\r
-       @%create $(OBJS)\ribbon.lbc\r
-       @%append $(OBJS)\ribbon.lbc option quiet\r
-       @%append $(OBJS)\ribbon.lbc name $^@\r
-       @%append $(OBJS)\ribbon.lbc option caseexact\r
-       @%append $(OBJS)\ribbon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(RIBBON_OBJECTS)) do @%append $(OBJS)\ribbon.lbc file %i\r
-       @for %i in ( $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ribbon.lbc library %i\r
-       @%append $(OBJS)\ribbon.lbc option resource=$(OBJS)\ribbon_sample.res\r
-       @for %i in () do @%append $(OBJS)\ribbon.lbc option stack=%i\r
-       wlink @$(OBJS)\ribbon.lbc\r
-\r
-$(OBJS)\ribbon_ribbondemo.obj :  .AUTODEPEND .\ribbondemo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RIBBON_CXXFLAGS) $<\r
-\r
-$(OBJS)\ribbon_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_RIBBON_p =
+!ifeq MONOLITHIC 0
+__WXLIB_RIBBON_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+RIBBON_OBJECTS =  &
+       $(OBJS)\ribbon_ribbondemo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\ribbon.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe
+
+$(OBJS)\ribbon.exe :  $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res
+       @%create $(OBJS)\ribbon.lbc
+       @%append $(OBJS)\ribbon.lbc option quiet
+       @%append $(OBJS)\ribbon.lbc name $^@
+       @%append $(OBJS)\ribbon.lbc option caseexact
+       @%append $(OBJS)\ribbon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(RIBBON_OBJECTS)) do @%append $(OBJS)\ribbon.lbc file %i
+       @for %i in ( $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ribbon.lbc library %i
+       @%append $(OBJS)\ribbon.lbc option resource=$(OBJS)\ribbon_sample.res
+       @for %i in () do @%append $(OBJS)\ribbon.lbc option stack=%i
+       wlink @$(OBJS)\ribbon.lbc
+
+$(OBJS)\ribbon_ribbondemo.obj :  .AUTODEPEND .\ribbondemo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(RIBBON_CXXFLAGS) $<
+
+$(OBJS)\ribbon_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/ribbon/ribbon.dsp b/samples/ribbon/ribbon.dsp
index 41e4537eb8dbb3971b8e78a1bd0455ea42bd82f3..34a505406b0749650132c66a8ab0d3676e2e38a6 100644 (file)
--- a/samples/ribbon/ribbon.dsp
+++ b/samples/ribbon/ribbon.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\ribbon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\ribbon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\ribbon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\ribbon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/ribbon/ribbon_vc7.vcproj b/samples/ribbon/ribbon_vc7.vcproj
index dbf44c212011afc66fe78cfebee0f29043ef22f0..120ed0b787874eafa0011f013f7440ac4e6c053e 100644 (file)
--- a/samples/ribbon/ribbon_vc7.vcproj
+++ b/samples/ribbon/ribbon_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/ribbon/ribbon_vc8.vcproj b/samples/ribbon/ribbon_vc8.vcproj
index 529cd7cc7fd15c36fe86ea6ffe372564cabfd0f0..0fdf550351b30dcd88e033754e92731923490700 100644 (file)
--- a/samples/ribbon/ribbon_vc8.vcproj
+++ b/samples/ribbon/ribbon_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/ribbon/ribbon_vc9.vcproj b/samples/ribbon/ribbon_vc9.vcproj
index 3dcba9e7e30b1d118013c08bbf9b8881d3dd0df9..a6eb3e976938e8e419982f5d1adf17b83af25cf1 100644 (file)
--- a/samples/ribbon/ribbon_vc9.vcproj
+++ b/samples/ribbon/ribbon_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ribbon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index 19a760b0637a34b196980e66c50b30bf1545b664..c4c1341bee3b5e34516d126cff7f22ff2b81e047 100644 (file)
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc
index 2ec43b942001ac2a8269ece98a22f0ead35b4544..61ca01683fdb075fb4366015134ce24952385732 100644 (file)
--- a/samples/richtext/makefile.bcc
+++ b/samples/richtext/makefile.bcc
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RICHTEXT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-RICHTEXT_OBJECTS =  \\r
-       $(OBJS)\richtext_richtext.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RICHTEXT_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\richtext.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe\r
-       -if exist $(OBJS)\richtext.tds del $(OBJS)\richtext.tds\r
-       -if exist $(OBJS)\richtext.ilc del $(OBJS)\richtext.ilc\r
-       -if exist $(OBJS)\richtext.ild del $(OBJS)\richtext.ild\r
-       -if exist $(OBJS)\richtext.ilf del $(OBJS)\richtext.ilf\r
-       -if exist $(OBJS)\richtext.ils del $(OBJS)\richtext.ils\r
-\r
-$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS)  $(OBJS)\richtext_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res\r
-|\r
-\r
-$(OBJS)\richtext_richtext.obj: .\richtext.cpp\r
-       $(CXX) -q -c -P -o$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp\r
-\r
-$(OBJS)\richtext_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RICHTEXT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXT_OBJECTS =  \
+       $(OBJS)\richtext_richtext.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\richtext.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
+       -if exist $(OBJS)\richtext.tds del $(OBJS)\richtext.tds
+       -if exist $(OBJS)\richtext.ilc del $(OBJS)\richtext.ilc
+       -if exist $(OBJS)\richtext.ild del $(OBJS)\richtext.ild
+       -if exist $(OBJS)\richtext.ilf del $(OBJS)\richtext.ilf
+       -if exist $(OBJS)\richtext.ils del $(OBJS)\richtext.ils
+
+$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS)  $(OBJS)\richtext_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res
+|
+
+$(OBJS)\richtext_richtext.obj: .\richtext.cpp
+       $(CXX) -q -c -P -o$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp
+
+$(OBJS)\richtext_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc
index 1fdd24287f0e785c9d3d660f357bd427726940df..9cdcbd51978aaf5db9f9744799e2d297420cb9a9 100644 (file)
--- a/samples/richtext/makefile.gcc
+++ b/samples/richtext/makefile.gcc
@@ -1,242 +1,242 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RICHTEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-RICHTEXT_OBJECTS =  \\r
-       $(OBJS)\richtext_richtext.o \\r
-       $(OBJS)\richtext_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_RICHTEXT_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\richtext.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe\r
-\r
-$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o\r
-       $(CXX) -o $@ $(RICHTEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\richtext_richtext.o: ./richtext.cpp\r
-       $(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\richtext_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RICHTEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXT_OBJECTS =  \
+       $(OBJS)\richtext_richtext.o \
+       $(OBJS)\richtext_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_RICHTEXT_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\richtext.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
+
+$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o
+       $(CXX) -o $@ $(RICHTEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\richtext_richtext.o: ./richtext.cpp
+       $(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\richtext_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx
index 77dc19816841fb64e735543292b4c6b13926da54..f769a839332ea364b13f8d90fdba260a3db42dae 100644 (file)
--- a/samples/richtext/makefile.unx
+++ b/samples/richtext/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc
index c480de6592cbdfd416f0c194aff34b3afeece69d..939c3548851e624429ec343fc5a92d09384546f2 100644 (file)
--- a/samples/richtext/makefile.vc
+++ b/samples/richtext/makefile.vc
@@ -1,327 +1,352 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-RICHTEXT_OBJECTS =  \\r
-       $(OBJS)\richtext_richtext.obj \\r
-       $(OBJS)\richtext_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RICHTEXT_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\richtext.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe\r
-       -if exist $(OBJS)\richtext.ilk del $(OBJS)\richtext.ilk\r
-       -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb\r
-\r
-$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(RICHTEXT_OBJECTS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\richtext_richtext.obj: .\richtext.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp\r
-\r
-$(OBJS)\richtext_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXT_OBJECTS =  \
+       $(OBJS)\richtext_richtext.obj
+RICHTEXT_RESOURCES =  \
+       $(OBJS)\richtext_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\richtext.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
+       -if exist $(OBJS)\richtext.ilk del $(OBJS)\richtext.ilk
+       -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb
+
+$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(RICHTEXT_OBJECTS) $(RICHTEXT_RESOURCES)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\richtext_richtext.obj: .\richtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp
+
+$(OBJS)\richtext_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat
index f395be91828286172cc09f8216e34ca552438475..ee26be301bb857134ec504768337ba55486d5c98 100644 (file)
--- a/samples/richtext/makefile.wat
+++ b/samples/richtext/makefile.wat
@@ -1,280 +1,280 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_RICHTEXT_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_RICHTEXT_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-RICHTEXT_OBJECTS =  &\r
-       $(OBJS)\richtext_richtext.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\richtext.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe\r
-\r
-$(OBJS)\richtext.exe :  $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res\r
-       @%create $(OBJS)\richtext.lbc\r
-       @%append $(OBJS)\richtext.lbc option quiet\r
-       @%append $(OBJS)\richtext.lbc name $^@\r
-       @%append $(OBJS)\richtext.lbc option caseexact\r
-       @%append $(OBJS)\richtext.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i\r
-       @for %i in ( $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\richtext.lbc library %i\r
-       @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res\r
-       @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i\r
-       wlink @$(OBJS)\richtext.lbc\r
-\r
-$(OBJS)\richtext_richtext.obj :  .AUTODEPEND .\richtext.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $<\r
-\r
-$(OBJS)\richtext_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_RICHTEXT_p =
+!ifeq MONOLITHIC 0
+__WXLIB_RICHTEXT_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+RICHTEXT_OBJECTS =  &
+       $(OBJS)\richtext_richtext.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\richtext.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
+
+$(OBJS)\richtext.exe :  $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
+       @%create $(OBJS)\richtext.lbc
+       @%append $(OBJS)\richtext.lbc option quiet
+       @%append $(OBJS)\richtext.lbc name $^@
+       @%append $(OBJS)\richtext.lbc option caseexact
+       @%append $(OBJS)\richtext.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i
+       @for %i in ( $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\richtext.lbc library %i
+       @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res
+       @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i
+       wlink @$(OBJS)\richtext.lbc
+
+$(OBJS)\richtext_richtext.obj :  .AUTODEPEND .\richtext.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $<
+
+$(OBJS)\richtext_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/richtext/richtext.dsp b/samples/richtext/richtext.dsp
index 1c682edfe5e0455e80d114c52dee6a680c159f0b..7a10a42d267c31d453b8e40f454b5007f6a44518 100644 (file)
--- a/samples/richtext/richtext.dsp
+++ b/samples/richtext/richtext.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\richtext"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\richtext"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\richtext"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\richtext"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/richtext/richtext_vc7.vcproj b/samples/richtext/richtext_vc7.vcproj
index 066cf5a6c21a1d71f8feadf4b7296d722ae4cc93..9f1f4b56cd72ba43d711a24d6255f593b066b256 100644 (file)
--- a/samples/richtext/richtext_vc7.vcproj
+++ b/samples/richtext/richtext_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\richtext.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\richtext.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\richtext.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\richtext.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/richtext/richtext_vc8.vcproj b/samples/richtext/richtext_vc8.vcproj
index 043e0c76d94fa1c62a80a97b6855c4410f3924ca..0bc0ac5c5ec80a517dd1a27eaa718bf171cad63a 100644 (file)
--- a/samples/richtext/richtext_vc8.vcproj
+++ b/samples/richtext/richtext_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/richtext/richtext_vc9.vcproj b/samples/richtext/richtext_vc9.vcproj
index 4fd435d0965fc11b6d5f0ed7eab3bb95141de820..851fb680cabacf62600e09c8f81cecc05b504577 100644 (file)
--- a/samples/richtext/richtext_vc9.vcproj
+++ b/samples/richtext/richtext_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_richtext.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_richtext.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\richtext.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\richtext.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 9f0acd2700bd80550fa96c3bf17f19590c8c4903..4ce18608b6ce0df5cca698a76e776ae7a8d228a9 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc
index 798ac790082161ed875f68fff0f465bc504d3e97..80e6c4d93f428db57fb12cd1b6e96da267e2e98c 100644 (file)
--- a/samples/sashtest/makefile.bcc
+++ b/samples/sashtest/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SASHTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SASHTEST_OBJECTS =  \\r
-       $(OBJS)\sashtest_sashtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sashtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe\r
-       -if exist $(OBJS)\sashtest.tds del $(OBJS)\sashtest.tds\r
-       -if exist $(OBJS)\sashtest.ilc del $(OBJS)\sashtest.ilc\r
-       -if exist $(OBJS)\sashtest.ild del $(OBJS)\sashtest.ild\r
-       -if exist $(OBJS)\sashtest.ilf del $(OBJS)\sashtest.ilf\r
-       -if exist $(OBJS)\sashtest.ils del $(OBJS)\sashtest.ils\r
-\r
-$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS)  $(OBJS)\sashtest_sashtest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SASHTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sashtest_sashtest.res\r
-|\r
-\r
-$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp\r
-       $(CXX) -q -c -P -o$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp\r
-\r
-$(OBJS)\sashtest_sashtest.res: .\sashtest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\sashtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SASHTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SASHTEST_OBJECTS =  \
+       $(OBJS)\sashtest_sashtest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sashtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
+       -if exist $(OBJS)\sashtest.tds del $(OBJS)\sashtest.tds
+       -if exist $(OBJS)\sashtest.ilc del $(OBJS)\sashtest.ilc
+       -if exist $(OBJS)\sashtest.ild del $(OBJS)\sashtest.ild
+       -if exist $(OBJS)\sashtest.ilf del $(OBJS)\sashtest.ilf
+       -if exist $(OBJS)\sashtest.ils del $(OBJS)\sashtest.ils
+
+$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS)  $(OBJS)\sashtest_sashtest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SASHTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sashtest_sashtest.res
+|
+
+$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp
+       $(CXX) -q -c -P -o$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp
+
+$(OBJS)\sashtest_sashtest.res: .\sashtest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\sashtest.rc
+

diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc
index 6aa74ad8ef4781e34072ef4a8eba653021c46a79..3c25fe4b16814e4a56ba0ab68040917f1c33c86a 100644 (file)
--- a/samples/sashtest/makefile.gcc
+++ b/samples/sashtest/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SASHTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SASHTEST_OBJECTS =  \\r
-       $(OBJS)\sashtest_sashtest.o \\r
-       $(OBJS)\sashtest_sashtest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sashtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe\r
-\r
-$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest_rc.o\r
-       $(CXX) -o $@ $(SASHTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\sashtest_sashtest.o: ./sashtest.cpp\r
-       $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\sashtest_sashtest_rc.o: ./sashtest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SASHTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SASHTEST_OBJECTS =  \
+       $(OBJS)\sashtest_sashtest.o \
+       $(OBJS)\sashtest_sashtest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sashtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
+
+$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest_rc.o
+       $(CXX) -o $@ $(SASHTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\sashtest_sashtest.o: ./sashtest.cpp
+       $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\sashtest_sashtest_rc.o: ./sashtest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx
index b4290efc8b5cfccb3eae1b4cfc81ad349b4f36b2..f8c80412d999fae621a0d09314d33d9503bd63bb 100644 (file)
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc
index c7f054c1a7dff3fb35c3294714020d22ce65731e..389519dce26b1077db2383523244ad27a53f6bbd 100644 (file)
--- a/samples/sashtest/makefile.vc
+++ b/samples/sashtest/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SASHTEST_OBJECTS =  \\r
-       $(OBJS)\sashtest_sashtest.obj \\r
-       $(OBJS)\sashtest_sashtest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sashtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe\r
-       -if exist $(OBJS)\sashtest.ilk del $(OBJS)\sashtest.ilk\r
-       -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb\r
-\r
-$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SASHTEST_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp\r
-\r
-$(OBJS)\sashtest_sashtest.res: .\sashtest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sashtest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SASHTEST_OBJECTS =  \
+       $(OBJS)\sashtest_sashtest.obj
+SASHTEST_RESOURCES =  \
+       $(OBJS)\sashtest_sashtest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sashtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
+       -if exist $(OBJS)\sashtest.ilk del $(OBJS)\sashtest.ilk
+       -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb
+
+$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SASHTEST_OBJECTS) $(SASHTEST_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp
+
+$(OBJS)\sashtest_sashtest.res: .\sashtest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sashtest.rc
+

diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat
index 25a6bb349a6a4507d8829c04495ee2370175917b..b7e96a49e068cb3d59af8fc054206ce8d878f04f 100644 (file)
--- a/samples/sashtest/makefile.wat
+++ b/samples/sashtest/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SASHTEST_OBJECTS =  &\r
-       $(OBJS)\sashtest_sashtest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\sashtest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe\r
-\r
-$(OBJS)\sashtest.exe :  $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res\r
-       @%create $(OBJS)\sashtest.lbc\r
-       @%append $(OBJS)\sashtest.lbc option quiet\r
-       @%append $(OBJS)\sashtest.lbc name $^@\r
-       @%append $(OBJS)\sashtest.lbc option caseexact\r
-       @%append $(OBJS)\sashtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sashtest.lbc library %i\r
-       @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res\r
-       @for %i in () do @%append $(OBJS)\sashtest.lbc option stack=%i\r
-       wlink @$(OBJS)\sashtest.lbc\r
-\r
-$(OBJS)\sashtest_sashtest.obj :  .AUTODEPEND .\sashtest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\sashtest_sashtest.res :  .AUTODEPEND .\sashtest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SASHTEST_OBJECTS =  &
+       $(OBJS)\sashtest_sashtest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\sashtest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
+
+$(OBJS)\sashtest.exe :  $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
+       @%create $(OBJS)\sashtest.lbc
+       @%append $(OBJS)\sashtest.lbc option quiet
+       @%append $(OBJS)\sashtest.lbc name $^@
+       @%append $(OBJS)\sashtest.lbc option caseexact
+       @%append $(OBJS)\sashtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sashtest.lbc library %i
+       @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res
+       @for %i in () do @%append $(OBJS)\sashtest.lbc option stack=%i
+       wlink @$(OBJS)\sashtest.lbc
+
+$(OBJS)\sashtest_sashtest.obj :  .AUTODEPEND .\sashtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $<
+
+$(OBJS)\sashtest_sashtest.res :  .AUTODEPEND .\sashtest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/sashtest/sashtest.dsp b/samples/sashtest/sashtest.dsp
index ab49a00d5211815448832baa090dd27f03132153..b165fc0f21560ec91c0dd8fcc15649156d4e26bf 100644 (file)
--- a/samples/sashtest/sashtest.dsp
+++ b/samples/sashtest/sashtest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\sashtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\sashtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\sashtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\sashtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj
index a53ca8373ec77e56f47feb297f02859a7356b52f..41dda9202851a8993e265cd85b69c081a87c9526 100644 (file)
--- a/samples/sashtest/sashtest_vc7.vcproj
+++ b/samples/sashtest/sashtest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\sashtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\sashtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\sashtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/sashtest/sashtest_vc8.vcproj b/samples/sashtest/sashtest_vc8.vcproj
index acaf297255a30534f62dfd1fd714aed50c44bba2..1bfa53e4d05ba349e7d684c8205c3f4281910b2c 100644 (file)
--- a/samples/sashtest/sashtest_vc8.vcproj
+++ b/samples/sashtest/sashtest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sashtest/sashtest_vc9.vcproj b/samples/sashtest/sashtest_vc9.vcproj
index 03cb8a95973728ee3f420683ecd0f6345b03dd5b..a79a1edbcc8bce5fed5ecb0f7c0f172c436f2542 100644 (file)
--- a/samples/sashtest/sashtest_vc9.vcproj
+++ b/samples/sashtest/sashtest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sashtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 0e6ed1c2ad66b99a608eba0a37ffc9db68c4a55b..887073230ac5aa2efd96072052f2b1db05544ce9 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index f7b6e4ed61392e1996e1c2ca92b17a2077d335fc..d30e8d8f524d5e4f733af1f35b36931298c98d45 100644 (file)
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCROLL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SCROLL_OBJECTS =  \\r
-       $(OBJS)\scroll_scroll.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\scroll.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
-       -if exist $(OBJS)\scroll.tds del $(OBJS)\scroll.tds\r
-       -if exist $(OBJS)\scroll.ilc del $(OBJS)\scroll.ilc\r
-       -if exist $(OBJS)\scroll.ild del $(OBJS)\scroll.ild\r
-       -if exist $(OBJS)\scroll.ilf del $(OBJS)\scroll.ilf\r
-       -if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils\r
-\r
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS)  $(OBJS)\scroll_scroll.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_scroll.res\r
-|\r
-\r
-$(OBJS)\scroll_scroll.obj: .\scroll.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
-\r
-$(OBJS)\scroll_scroll.res: .\scroll.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\scroll.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCROLL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SCROLL_OBJECTS =  \
+       $(OBJS)\scroll_scroll.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\scroll.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
+       -if exist $(OBJS)\scroll.tds del $(OBJS)\scroll.tds
+       -if exist $(OBJS)\scroll.ilc del $(OBJS)\scroll.ilc
+       -if exist $(OBJS)\scroll.ild del $(OBJS)\scroll.ild
+       -if exist $(OBJS)\scroll.ilf del $(OBJS)\scroll.ilf
+       -if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils
+
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS)  $(OBJS)\scroll_scroll.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_scroll.res
+|
+
+$(OBJS)\scroll_scroll.obj: .\scroll.cpp
+       $(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) .\scroll.cpp
+
+$(OBJS)\scroll_scroll.res: .\scroll.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\scroll.rc
+

diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index b861a1d8bd1822cb6116f0a589a937e36ed3571c..6f318a841ff68eef4cb190fd6eb3cf11ce5e06c4 100644 (file)
--- a/samples/scroll/makefile.gcc
+++ b/samples/scroll/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCROLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SCROLL_OBJECTS =  \\r
-       $(OBJS)\scroll_scroll.o \\r
-       $(OBJS)\scroll_scroll_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\scroll.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
-\r
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o\r
-       $(CXX) -o $@ $(SCROLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\scroll_scroll.o: ./scroll.cpp\r
-       $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\scroll_scroll_rc.o: ./scroll.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCROLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SCROLL_OBJECTS =  \
+       $(OBJS)\scroll_scroll.o \
+       $(OBJS)\scroll_scroll_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\scroll.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
+
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o
+       $(CXX) -o $@ $(SCROLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\scroll_scroll.o: ./scroll.cpp
+       $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\scroll_scroll_rc.o: ./scroll.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
index b26c4086dafda2dac68129ce23b55b91a916cf0a..f5e3793c13a3c7e7f38932ac590ef9c8acf82e4c 100644 (file)
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index cff04480b5e7353d3f47e3a9359cab9ea51bbae8..6fa5531438d39bc13d6eee5a44bc727fd96f2fab 100644 (file)
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SCROLL_OBJECTS =  \\r
-       $(OBJS)\scroll_scroll.obj \\r
-       $(OBJS)\scroll_scroll.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\scroll.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
-       -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk\r
-       -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb\r
-\r
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SCROLL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\scroll_scroll.obj: .\scroll.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
-\r
-$(OBJS)\scroll_scroll.res: .\scroll.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\scroll.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SCROLL_OBJECTS =  \
+       $(OBJS)\scroll_scroll.obj
+SCROLL_RESOURCES =  \
+       $(OBJS)\scroll_scroll.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\scroll.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
+       -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk
+       -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb
+
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SCROLL_OBJECTS) $(SCROLL_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\scroll_scroll.obj: .\scroll.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp
+
+$(OBJS)\scroll_scroll.res: .\scroll.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\scroll.rc
+

diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index 8c4fdf264af48f6185fbf076d9bbe503a29d5d10..586eccc0e5468eead0060116ccf0c160575baace 100644 (file)
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SCROLL_OBJECTS =  &\r
-       $(OBJS)\scroll_scroll.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\scroll.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
-\r
-$(OBJS)\scroll.exe :  $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res\r
-       @%create $(OBJS)\scroll.lbc\r
-       @%append $(OBJS)\scroll.lbc option quiet\r
-       @%append $(OBJS)\scroll.lbc name $^@\r
-       @%append $(OBJS)\scroll.lbc option caseexact\r
-       @%append $(OBJS)\scroll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\scroll.lbc library %i\r
-       @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res\r
-       @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i\r
-       wlink @$(OBJS)\scroll.lbc\r
-\r
-$(OBJS)\scroll_scroll.obj :  .AUTODEPEND .\scroll.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $<\r
-\r
-$(OBJS)\scroll_scroll.res :  .AUTODEPEND .\scroll.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SCROLL_OBJECTS =  &
+       $(OBJS)\scroll_scroll.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\scroll.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
+
+$(OBJS)\scroll.exe :  $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
+       @%create $(OBJS)\scroll.lbc
+       @%append $(OBJS)\scroll.lbc option quiet
+       @%append $(OBJS)\scroll.lbc name $^@
+       @%append $(OBJS)\scroll.lbc option caseexact
+       @%append $(OBJS)\scroll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\scroll.lbc library %i
+       @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res
+       @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i
+       wlink @$(OBJS)\scroll.lbc
+
+$(OBJS)\scroll_scroll.obj :  .AUTODEPEND .\scroll.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $<
+
+$(OBJS)\scroll_scroll.res :  .AUTODEPEND .\scroll.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/scroll/scroll.dsp b/samples/scroll/scroll.dsp
index 26be16baf451baebcf431e8ddc98b3f50dfa4bbb..3b0d09b90d91426d4811991331101fb40dde3561 100644 (file)
--- a/samples/scroll/scroll.dsp
+++ b/samples/scroll/scroll.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\scroll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\scroll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\scroll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\scroll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj
index 0127439e3009290a8ba937054b7c63e3b1d3ab44..464ea46dab07f612495849cb8642bce32d9a2cdf 100644 (file)
--- a/samples/scroll/scroll_vc7.vcproj
+++ b/samples/scroll/scroll_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\scroll.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\scroll.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\scroll.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\scroll.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj
index a8621680b55c2ee5febdea2b6fba5dab1f055ebd..2a9d538a98f79eba38bc92ed5b98f87c00c1901b 100644 (file)
--- a/samples/scroll/scroll_vc8.vcproj
+++ b/samples/scroll/scroll_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/scroll/scroll_vc9.vcproj b/samples/scroll/scroll_vc9.vcproj
index 7e52f0bcd5a31d8d65d4c594792c6b5edd19232f..34158bcf8710329b867fc86dad4dc713193d003e 100644 (file)
--- a/samples/scroll/scroll_vc9.vcproj
+++ b/samples/scroll/scroll_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\scroll.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\scroll.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 9d71869860c025ee276036fc89a74c9f3cf9609f..8de26794fe95a3600ec91ffbd433118be75e1d2b 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index f2cd89bf7cca7fd0e9a11403284a50103ec9f230..c017b11dde3296e86ee8ecc662d55134e152a892 100644 (file)
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SHAPED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SHAPED_OBJECTS =  \\r
-       $(OBJS)\shaped_shaped.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\shaped.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
-       -if exist $(OBJS)\shaped.tds del $(OBJS)\shaped.tds\r
-       -if exist $(OBJS)\shaped.ilc del $(OBJS)\shaped.ilc\r
-       -if exist $(OBJS)\shaped.ild del $(OBJS)\shaped.ild\r
-       -if exist $(OBJS)\shaped.ilf del $(OBJS)\shaped.ilf\r
-       -if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils\r
-\r
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS)  $(OBJS)\shaped_shaped.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_shaped.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\shaped_shaped.obj: .\shaped.cpp\r
-       $(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
-\r
-$(OBJS)\shaped_shaped.res: .\shaped.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\shaped.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SHAPED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SHAPED_OBJECTS =  \
+       $(OBJS)\shaped_shaped.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\shaped.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
+       -if exist $(OBJS)\shaped.tds del $(OBJS)\shaped.tds
+       -if exist $(OBJS)\shaped.ilc del $(OBJS)\shaped.ilc
+       -if exist $(OBJS)\shaped.ild del $(OBJS)\shaped.ild
+       -if exist $(OBJS)\shaped.ilf del $(OBJS)\shaped.ilf
+       -if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils
+
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS)  $(OBJS)\shaped_shaped.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_shaped.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\shaped_shaped.obj: .\shaped.cpp
+       $(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) .\shaped.cpp
+
+$(OBJS)\shaped_shaped.res: .\shaped.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\shaped.rc
+

diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index bbe3bf67a15332a4b427a7c9f8a74d50623c4068..2e20cdb4d74879d7adb5e95ba1e9f63387dbf677 100644 (file)
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SHAPED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SHAPED_OBJECTS =  \\r
-       $(OBJS)\shaped_shaped.o \\r
-       $(OBJS)\shaped_shaped_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\shaped.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
-\r
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o\r
-       $(CXX) -o $@ $(SHAPED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\shaped_shaped.o: ./shaped.cpp\r
-       $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\shaped_shaped_rc.o: ./shaped.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SHAPED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SHAPED_OBJECTS =  \
+       $(OBJS)\shaped_shaped.o \
+       $(OBJS)\shaped_shaped_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\shaped.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
+
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o
+       $(CXX) -o $@ $(SHAPED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\shaped_shaped.o: ./shaped.cpp
+       $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\shaped_shaped_rc.o: ./shaped.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx
index 3d869a9c0602e4d60cb8d32c414a766440dbdc33..e1df8a94ecaf032837cefd36a6a3f01dc068c237 100644 (file)
--- a/samples/shaped/makefile.unx
+++ b/samples/shaped/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 240770306a7e736d11eec4666e673a92817b855e..3716f20cc6128ed3b482d4206ab50542139b51f3 100644 (file)
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SHAPED_OBJECTS =  \\r
-       $(OBJS)\shaped_shaped.obj \\r
-       $(OBJS)\shaped_shaped.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\shaped.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
-       -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk\r
-       -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb\r
-\r
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SHAPED_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\shaped_shaped.obj: .\shaped.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
-\r
-$(OBJS)\shaped_shaped.res: .\shaped.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\shaped.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SHAPED_OBJECTS =  \
+       $(OBJS)\shaped_shaped.obj
+SHAPED_RESOURCES =  \
+       $(OBJS)\shaped_shaped.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\shaped.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
+       -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk
+       -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb
+
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SHAPED_OBJECTS) $(SHAPED_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\shaped_shaped.obj: .\shaped.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp
+
+$(OBJS)\shaped_shaped.res: .\shaped.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\shaped.rc
+

diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat
index 29a3221255fe6574ed713c5f5618dd0bebafcb3a..caacdc99274cf091bbfcac9441aa81260241302f 100644 (file)
--- a/samples/shaped/makefile.wat
+++ b/samples/shaped/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SHAPED_OBJECTS =  &\r
-       $(OBJS)\shaped_shaped.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\shaped.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
-\r
-$(OBJS)\shaped.exe :  $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res\r
-       @%create $(OBJS)\shaped.lbc\r
-       @%append $(OBJS)\shaped.lbc option quiet\r
-       @%append $(OBJS)\shaped.lbc name $^@\r
-       @%append $(OBJS)\shaped.lbc option caseexact\r
-       @%append $(OBJS)\shaped.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\shaped.lbc library %i\r
-       @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res\r
-       @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i\r
-       wlink @$(OBJS)\shaped.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\shaped_shaped.obj :  .AUTODEPEND .\shaped.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<\r
-\r
-$(OBJS)\shaped_shaped.res :  .AUTODEPEND .\shaped.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SHAPED_OBJECTS =  &
+       $(OBJS)\shaped_shaped.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\shaped.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
+
+$(OBJS)\shaped.exe :  $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
+       @%create $(OBJS)\shaped.lbc
+       @%append $(OBJS)\shaped.lbc option quiet
+       @%append $(OBJS)\shaped.lbc name $^@
+       @%append $(OBJS)\shaped.lbc option caseexact
+       @%append $(OBJS)\shaped.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\shaped.lbc library %i
+       @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res
+       @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i
+       wlink @$(OBJS)\shaped.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\shaped_shaped.obj :  .AUTODEPEND .\shaped.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<
+
+$(OBJS)\shaped_shaped.res :  .AUTODEPEND .\shaped.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/shaped/shaped.dsp b/samples/shaped/shaped.dsp
index 778f45343a4810c0cf3864c179ff17ff33a08ed9..317fbc9b871b9bb77e79a014f1afbc7c2c6a9129 100644 (file)
--- a/samples/shaped/shaped.dsp
+++ b/samples/shaped/shaped.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\shaped"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\shaped"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\shaped"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\shaped"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj
index 86e7c47fbc38b38b7339f2c0f5b0765ab61bbaab..d80f4f9c50daf42d72dae3cf86544b5539d944d5 100644 (file)
--- a/samples/shaped/shaped_vc7.vcproj
+++ b/samples/shaped/shaped_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\shaped.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\shaped.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\shaped.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\shaped.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj
index a48ad326ae2af0425226f95040b3be5387d36163..fe401c4fd69ba740b28031f5255ca5e990ef86f4 100644 (file)
--- a/samples/shaped/shaped_vc8.vcproj
+++ b/samples/shaped/shaped_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/shaped/shaped_vc9.vcproj b/samples/shaped/shaped_vc9.vcproj
index 88aff3312cb63a31929d263533348e81006f21bb..e608db53f5329682a7da0cc1b496e56207eeb261 100644 (file)
--- a/samples/shaped/shaped_vc9.vcproj
+++ b/samples/shaped/shaped_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\shaped.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\shaped.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 2f4b819150b3f68e723c8a80d8696d711b8e89d3..3cb134a818fa532d9788603ef7b056170894f00e 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index 58e8a26988f365a8db666dd325310f7cd6e24446..7f97761a01760e99f8b37b0d5c31f7f2039b5738 100644 (file)
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -1,315 +1,315 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-CLIENT_OBJECTS =  \\r
-       $(OBJS)\client_client.obj\r
-SERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SERVER_OBJECTS =  \\r
-       $(OBJS)\server_server.obj\r
-BASECLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-BASECLIENT_OBJECTS =  \\r
-       $(OBJS)\baseclient_baseclient.obj\r
-BASESERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-BASESERVER_OBJECTS =  \\r
-       $(OBJS)\baseserver_baseserver.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__client___depname = $(OBJS)\client.exe\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__server___depname = $(OBJS)\server.exe\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_0 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_0 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_0 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_0 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_0 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_0 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_0 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_2 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_2 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_2 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_2 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe\r
-       -if exist $(OBJS)\client.tds del $(OBJS)\client.tds\r
-       -if exist $(OBJS)\client.ilc del $(OBJS)\client.ilc\r
-       -if exist $(OBJS)\client.ild del $(OBJS)\client.ild\r
-       -if exist $(OBJS)\client.ilf del $(OBJS)\client.ilf\r
-       -if exist $(OBJS)\client.ils del $(OBJS)\client.ils\r
-       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe\r
-       -if exist $(OBJS)\server.tds del $(OBJS)\server.tds\r
-       -if exist $(OBJS)\server.ilc del $(OBJS)\server.ilc\r
-       -if exist $(OBJS)\server.ild del $(OBJS)\server.ild\r
-       -if exist $(OBJS)\server.ilf del $(OBJS)\server.ilf\r
-       -if exist $(OBJS)\server.ils del $(OBJS)\server.ils\r
-       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe\r
-       -if exist $(OBJS)\baseclient.tds del $(OBJS)\baseclient.tds\r
-       -if exist $(OBJS)\baseclient.ilc del $(OBJS)\baseclient.ilc\r
-       -if exist $(OBJS)\baseclient.ild del $(OBJS)\baseclient.ild\r
-       -if exist $(OBJS)\baseclient.ilf del $(OBJS)\baseclient.ilf\r
-       -if exist $(OBJS)\baseclient.ils del $(OBJS)\baseclient.ils\r
-       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
-       -if exist $(OBJS)\baseserver.tds del $(OBJS)\baseserver.tds\r
-       -if exist $(OBJS)\baseserver.ilc del $(OBJS)\baseserver.ilc\r
-       -if exist $(OBJS)\baseserver.ild del $(OBJS)\baseserver.ild\r
-       -if exist $(OBJS)\baseserver.ilf del $(OBJS)\baseserver.ilf\r
-       -if exist $(OBJS)\baseserver.ils del $(OBJS)\baseserver.ils\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\client.exe: $(CLIENT_OBJECTS)  $(OBJS)\client_client.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_client.res\r
-|\r
-!endif\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\server.exe: $(SERVER_OBJECTS)  $(OBJS)\server_server.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_server.res\r
-|\r
-!endif\r
-\r
-$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,\r
-|\r
-\r
-$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,\r
-|\r
-\r
-$(OBJS)\client_client.obj: .\client.cpp\r
-       $(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
-\r
-$(OBJS)\client_client.res: .\client.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\client.rc\r
-\r
-$(OBJS)\server_server.obj: .\server.cpp\r
-       $(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) .\server.cpp\r
-\r
-$(OBJS)\server_server.res: .\server.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\server.rc\r
-\r
-$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
-       $(CXX) -q -c -P -o$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
-\r
-$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp\r
-       $(CXX) -q -c -P -o$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+CLIENT_OBJECTS =  \
+       $(OBJS)\client_client.obj
+SERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SERVER_OBJECTS =  \
+       $(OBJS)\server_server.obj
+BASECLIENT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BASECLIENT_OBJECTS =  \
+       $(OBJS)\baseclient_baseclient.obj
+BASESERVER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BASESERVER_OBJECTS =  \
+       $(OBJS)\baseserver_baseserver.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_GUI)" == "1"
+__client___depname = $(OBJS)\client.exe
+!endif
+!if "$(USE_GUI)" == "1"
+__server___depname = $(OBJS)\server.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_0 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_0 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_0 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_0 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_0 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_0 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_0 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_2 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_2 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_2 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_2 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe
+       -if exist $(OBJS)\client.tds del $(OBJS)\client.tds
+       -if exist $(OBJS)\client.ilc del $(OBJS)\client.ilc
+       -if exist $(OBJS)\client.ild del $(OBJS)\client.ild
+       -if exist $(OBJS)\client.ilf del $(OBJS)\client.ilf
+       -if exist $(OBJS)\client.ils del $(OBJS)\client.ils
+       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe
+       -if exist $(OBJS)\server.tds del $(OBJS)\server.tds
+       -if exist $(OBJS)\server.ilc del $(OBJS)\server.ilc
+       -if exist $(OBJS)\server.ild del $(OBJS)\server.ild
+       -if exist $(OBJS)\server.ilf del $(OBJS)\server.ilf
+       -if exist $(OBJS)\server.ils del $(OBJS)\server.ils
+       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe
+       -if exist $(OBJS)\baseclient.tds del $(OBJS)\baseclient.tds
+       -if exist $(OBJS)\baseclient.ilc del $(OBJS)\baseclient.ilc
+       -if exist $(OBJS)\baseclient.ild del $(OBJS)\baseclient.ild
+       -if exist $(OBJS)\baseclient.ilf del $(OBJS)\baseclient.ilf
+       -if exist $(OBJS)\baseclient.ils del $(OBJS)\baseclient.ils
+       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
+       -if exist $(OBJS)\baseserver.tds del $(OBJS)\baseserver.tds
+       -if exist $(OBJS)\baseserver.ilc del $(OBJS)\baseserver.ilc
+       -if exist $(OBJS)\baseserver.ild del $(OBJS)\baseserver.ild
+       -if exist $(OBJS)\baseserver.ilf del $(OBJS)\baseserver.ilf
+       -if exist $(OBJS)\baseserver.ils del $(OBJS)\baseserver.ils
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\client.exe: $(CLIENT_OBJECTS)  $(OBJS)\client_client.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_client.res
+|
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\server.exe: $(SERVER_OBJECTS)  $(OBJS)\server_server.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_server.res
+|
+!endif
+
+$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+
+$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+|
+
+$(OBJS)\client_client.obj: .\client.cpp
+       $(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) .\client.cpp
+
+$(OBJS)\client_client.res: .\client.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\client.rc
+
+$(OBJS)\server_server.obj: .\server.cpp
+       $(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) .\server.cpp
+
+$(OBJS)\server_server.res: .\server.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\server.rc
+
+$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp
+       $(CXX) -q -c -P -o$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp
+
+$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp
+       $(CXX) -q -c -P -o$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp
+

diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index 456f498f502578fb0d39e3bb4311f26b6b2fbcc5..d6fa92724db4196a2e35ebaea02a4e7631aa389d 100644 (file)
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -1,292 +1,292 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-CLIENT_OBJECTS =  \\r
-       $(OBJS)\client_client.o \\r
-       $(OBJS)\client_client_rc.o\r
-SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-SERVER_OBJECTS =  \\r
-       $(OBJS)\server_server.o \\r
-       $(OBJS)\server_server_rc.o\r
-BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BASECLIENT_OBJECTS =  \\r
-       $(OBJS)\baseclient_baseclient.o\r
-BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BASESERVER_OBJECTS =  \\r
-       $(OBJS)\baseserver_baseserver.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__client___depname = $(OBJS)\client.exe\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__server___depname = $(OBJS)\server.exe\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_0 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_0 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_0 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_0 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe\r
-       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe\r
-       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe\r
-       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
-\r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o\r
-       $(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o\r
-       $(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)\r
-       $(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
-       $(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\client_client.o: ./client.cpp\r
-       $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\client_client_rc.o: ./client.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\server_server.o: ./server.cpp\r
-       $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\server_server_rc.o: ./server.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\baseclient_baseclient.o: ./baseclient.cpp\r
-       $(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\baseserver_baseserver.o: ./baseserver.cpp\r
-       $(CXX) -c -o $@ $(BASESERVER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+CLIENT_OBJECTS =  \
+       $(OBJS)\client_client.o \
+       $(OBJS)\client_client_rc.o
+SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+SERVER_OBJECTS =  \
+       $(OBJS)\server_server.o \
+       $(OBJS)\server_server_rc.o
+BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BASECLIENT_OBJECTS =  \
+       $(OBJS)\baseclient_baseclient.o
+BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BASESERVER_OBJECTS =  \
+       $(OBJS)\baseserver_baseserver.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_GUI),1)
+__client___depname = $(OBJS)\client.exe
+endif
+ifeq ($(USE_GUI),1)
+__server___depname = $(OBJS)\server.exe
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_0 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_0 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe
+       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe
+       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe
+       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o
+       $(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o
+       $(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
+       $(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
+       $(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\client_client.o: ./client.cpp
+       $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\client_client_rc.o: ./client.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\server_server.o: ./server.cpp
+       $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\server_server_rc.o: ./server.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\baseclient_baseclient.o: ./baseclient.cpp
+       $(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\baseserver_baseserver.o: ./baseserver.cpp
+       $(CXX) -c -o $@ $(BASESERVER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index d69635c11b71d3a29966417b85241c2a7cf9b1bc..15575217bd1a022e63a75d460a4cf295867064d5 100644 (file)
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index b09a0228571b1d299d0f3634a6867de223ed05eb..273eecac40ff4713fb716e0e1514dd8c5c7b4ef2 100644 (file)
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -1,410 +1,472 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
-       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-CLIENT_OBJECTS =  \\r
-       $(OBJS)\client_client.obj \\r
-       $(OBJS)\client_client.res\r
-SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
-       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-SERVER_OBJECTS =  \\r
-       $(OBJS)\server_server.obj \\r
-       $(OBJS)\server_server.res\r
-BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-BASECLIENT_OBJECTS =  \\r
-       $(OBJS)\baseclient_baseclient.obj\r
-BASESERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \\r
-       $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(____DEBUGRUNTIME) \\r
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-BASESERVER_OBJECTS =  \\r
-       $(OBJS)\baseserver_baseserver.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__client___depname = $(OBJS)\client.exe\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__server___depname = $(OBJS)\server.exe\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_22 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_36 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_36 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_50 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_50 = $(__THREADSFLAG)\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_0 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_0 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_0 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_0 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_0 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_0 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_0 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_0 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_3 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_3 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_3 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_3 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = T\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe\r
-       -if exist $(OBJS)\client.ilk del $(OBJS)\client.ilk\r
-       -if exist $(OBJS)\client.pdb del $(OBJS)\client.pdb\r
-       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe\r
-       -if exist $(OBJS)\server.ilk del $(OBJS)\server.ilk\r
-       -if exist $(OBJS)\server.pdb del $(OBJS)\server.pdb\r
-       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe\r
-       -if exist $(OBJS)\baseclient.ilk del $(OBJS)\baseclient.ilk\r
-       -if exist $(OBJS)\baseclient.pdb del $(OBJS)\baseclient.pdb\r
-       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
-       -if exist $(OBJS)\baseserver.ilk del $(OBJS)\baseserver.ilk\r
-       -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\client.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(CLIENT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\server.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SERVER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(BASECLIENT_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(BASESERVER_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\client_client.obj: .\client.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
-\r
-$(OBJS)\client_client.res: .\client.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\client.rc\r
-\r
-$(OBJS)\server_server.obj: .\server.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp\r
-\r
-$(OBJS)\server_server.res: .\server.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\server.rc\r
-\r
-$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
-\r
-$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
+       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+CLIENT_OBJECTS =  \
+       $(OBJS)\client_client.obj
+CLIENT_RESOURCES =  \
+       $(OBJS)\client_client.res
+SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(__DEBUGINFO_18) $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
+       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+SERVER_OBJECTS =  \
+       $(OBJS)\server_server.obj
+SERVER_RESOURCES =  \
+       $(OBJS)\server_server.res
+BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(__DEBUGINFO_34) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+BASECLIENT_OBJECTS =  \
+       $(OBJS)\baseclient_baseclient.obj
+BASESERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(__DEBUGINFO_50) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
+BASESERVER_OBJECTS =  \
+       $(OBJS)\baseserver_baseserver.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_GUI)" == "1"
+__client___depname = $(OBJS)\client.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
+!endif
+!if "$(USE_GUI)" == "1"
+__server___depname = $(OBJS)\server.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_18 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_18 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_18 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_26 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_26 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_34 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_34 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_42 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_42 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_50 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_50 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_50 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_50 = $(__DEBUGRUNTIME_2)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_58 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_58 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_0 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_0 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_0 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_0 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_0 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_0 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_0 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_0 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_2 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_2 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe
+       -if exist $(OBJS)\client.ilk del $(OBJS)\client.ilk
+       -if exist $(OBJS)\client.pdb del $(OBJS)\client.pdb
+       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe
+       -if exist $(OBJS)\server.ilk del $(OBJS)\server.ilk
+       -if exist $(OBJS)\server.pdb del $(OBJS)\server.pdb
+       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe
+       -if exist $(OBJS)\baseclient.ilk del $(OBJS)\baseclient.ilk
+       -if exist $(OBJS)\baseclient.pdb del $(OBJS)\baseclient.pdb
+       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
+       -if exist $(OBJS)\baseserver.ilk del $(OBJS)\baseserver.ilk
+       -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(CLIENT_OBJECTS) $(CLIENT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SERVER_OBJECTS) $(SERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(BASECLIENT_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(BASESERVER_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\client_client.obj: .\client.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp
+
+$(OBJS)\client_client.res: .\client.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\client.rc
+
+$(OBJS)\server_server.obj: .\server.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp
+
+$(OBJS)\server_server.res: .\server.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\server.rc
+
+$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp
+
+$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp
+

diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index a7c2d2353742e7faa2ab3adfa087052cd7f18c6f..643809958aa8b648989bfe909eb44f5f55ed93b5 100644 (file)
--- a/samples/sockets/makefile.wat
+++ b/samples/sockets/makefile.wat
@@ -1,353 +1,353 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__client___depname =\r
-!ifeq USE_GUI 1\r
-__client___depname = $(OBJS)\client.exe\r
-!endif\r
-__server___depname =\r
-!ifeq USE_GUI 1\r
-__server___depname = $(OBJS)\server.exe\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__DEBUGINFO =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO = -d2\r
-!endif\r
-__DEBUGINFO_3 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_3 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_3 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_3 = debug all\r
-!endif\r
-__OPTIMIZEFLAG =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG = -ot -ox\r
-!endif\r
-__THREADSFLAG =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG = -bm\r
-!endif\r
-__RUNTIME_LIBS =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS = \r
-!endif\r
-__RTTIFLAG =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG = -xr\r
-!endif\r
-__EXCEPTIONSFLAG =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-CLIENT_OBJECTS =  &\r
-       $(OBJS)\client_client.obj\r
-SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SERVER_OBJECTS =  &\r
-       $(OBJS)\server_server.obj\r
-BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-BASECLIENT_OBJECTS =  &\r
-       $(OBJS)\baseclient_baseclient.obj\r
-BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
-BASESERVER_OBJECTS =  &\r
-       $(OBJS)\baseserver_baseserver.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe\r
-       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe\r
-       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe\r
-       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
-\r
-!ifeq USE_GUI 1\r
-$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_client.res\r
-       @%create $(OBJS)\client.lbc\r
-       @%append $(OBJS)\client.lbc option quiet\r
-       @%append $(OBJS)\client.lbc name $^@\r
-       @%append $(OBJS)\client.lbc option caseexact\r
-       @%append $(OBJS)\client.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\client.lbc library %i\r
-       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res\r
-       @for %i in () do @%append $(OBJS)\client.lbc option stack=%i\r
-       wlink @$(OBJS)\client.lbc\r
-!endif\r
-\r
-!ifeq USE_GUI 1\r
-$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_server.res\r
-       @%create $(OBJS)\server.lbc\r
-       @%append $(OBJS)\server.lbc option quiet\r
-       @%append $(OBJS)\server.lbc name $^@\r
-       @%append $(OBJS)\server.lbc option caseexact\r
-       @%append $(OBJS)\server.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\server.lbc library %i\r
-       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res\r
-       @for %i in () do @%append $(OBJS)\server.lbc option stack=%i\r
-       wlink @$(OBJS)\server.lbc\r
-!endif\r
-\r
-$(OBJS)\baseclient.exe :  $(BASECLIENT_OBJECTS)\r
-       @%create $(OBJS)\baseclient.lbc\r
-       @%append $(OBJS)\baseclient.lbc option quiet\r
-       @%append $(OBJS)\baseclient.lbc name $^@\r
-       @%append $(OBJS)\baseclient.lbc option caseexact\r
-       @%append $(OBJS)\baseclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i\r
-       @%append $(OBJS)\baseclient.lbc\r
-       @for %i in () do @%append $(OBJS)\baseclient.lbc option stack=%i\r
-       wlink @$(OBJS)\baseclient.lbc\r
-\r
-$(OBJS)\baseserver.exe :  $(BASESERVER_OBJECTS)\r
-       @%create $(OBJS)\baseserver.lbc\r
-       @%append $(OBJS)\baseserver.lbc option quiet\r
-       @%append $(OBJS)\baseserver.lbc name $^@\r
-       @%append $(OBJS)\baseserver.lbc option caseexact\r
-       @%append $(OBJS)\baseserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i\r
-       @%append $(OBJS)\baseserver.lbc\r
-       @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i\r
-       wlink @$(OBJS)\baseserver.lbc\r
-\r
-$(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<\r
-\r
-$(OBJS)\client_client.res :  .AUTODEPEND .\client.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<\r
-\r
-$(OBJS)\server_server.res :  .AUTODEPEND .\server.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\baseclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<\r
-\r
-$(OBJS)\baseserver_baseserver.obj :  .AUTODEPEND .\baseserver.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BASESERVER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__client___depname =
+!ifeq USE_GUI 1
+__client___depname = $(OBJS)\client.exe
+!endif
+__server___depname =
+!ifeq USE_GUI 1
+__server___depname = $(OBJS)\server.exe
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__DEBUGINFO =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_3 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_3 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_3 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_3 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_3 = debug all
+!endif
+__OPTIMIZEFLAG =
+!ifeq BUILD debug
+__OPTIMIZEFLAG = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG = -ot -ox
+!endif
+__THREADSFLAG =
+!ifeq USE_THREADS 0
+__THREADSFLAG = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG = -bm
+!endif
+__RUNTIME_LIBS =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS = 
+!endif
+__RTTIFLAG =
+!ifeq USE_RTTI 0
+__RTTIFLAG = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG = -xr
+!endif
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+CLIENT_OBJECTS =  &
+       $(OBJS)\client_client.obj
+SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SERVER_OBJECTS =  &
+       $(OBJS)\server_server.obj
+BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BASECLIENT_OBJECTS =  &
+       $(OBJS)\baseclient_baseclient.obj
+BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+BASESERVER_OBJECTS =  &
+       $(OBJS)\baseserver_baseserver.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\client.exe del $(OBJS)\client.exe
+       -if exist $(OBJS)\server.exe del $(OBJS)\server.exe
+       -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe
+       -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
+
+!ifeq USE_GUI 1
+$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_client.res
+       @%create $(OBJS)\client.lbc
+       @%append $(OBJS)\client.lbc option quiet
+       @%append $(OBJS)\client.lbc name $^@
+       @%append $(OBJS)\client.lbc option caseexact
+       @%append $(OBJS)\client.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\client.lbc library %i
+       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res
+       @for %i in () do @%append $(OBJS)\client.lbc option stack=%i
+       wlink @$(OBJS)\client.lbc
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_server.res
+       @%create $(OBJS)\server.lbc
+       @%append $(OBJS)\server.lbc option quiet
+       @%append $(OBJS)\server.lbc name $^@
+       @%append $(OBJS)\server.lbc option caseexact
+       @%append $(OBJS)\server.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\server.lbc library %i
+       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res
+       @for %i in () do @%append $(OBJS)\server.lbc option stack=%i
+       wlink @$(OBJS)\server.lbc
+!endif
+
+$(OBJS)\baseclient.exe :  $(BASECLIENT_OBJECTS)
+       @%create $(OBJS)\baseclient.lbc
+       @%append $(OBJS)\baseclient.lbc option quiet
+       @%append $(OBJS)\baseclient.lbc name $^@
+       @%append $(OBJS)\baseclient.lbc option caseexact
+       @%append $(OBJS)\baseclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i
+       @%append $(OBJS)\baseclient.lbc
+       @for %i in () do @%append $(OBJS)\baseclient.lbc option stack=%i
+       wlink @$(OBJS)\baseclient.lbc
+
+$(OBJS)\baseserver.exe :  $(BASESERVER_OBJECTS)
+       @%create $(OBJS)\baseserver.lbc
+       @%append $(OBJS)\baseserver.lbc option quiet
+       @%append $(OBJS)\baseserver.lbc name $^@
+       @%append $(OBJS)\baseserver.lbc option caseexact
+       @%append $(OBJS)\baseserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i
+       @%append $(OBJS)\baseserver.lbc
+       @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i
+       wlink @$(OBJS)\baseserver.lbc
+
+$(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
+
+$(OBJS)\client_client.res :  .AUTODEPEND .\client.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<
+
+$(OBJS)\server_server.res :  .AUTODEPEND .\server.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\baseclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<
+
+$(OBJS)\baseserver_baseserver.obj :  .AUTODEPEND .\baseserver.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASESERVER_CXXFLAGS) $<
+

diff --git a/samples/sockets/sockets_baseclient.dsp b/samples/sockets/sockets_baseclient.dsp
index e9dc2eba436fb871f27a523d73b7a0cd1a6f1515..8e9b81d193ee1bf153aec686a5d904bb843851fb 100644 (file)
--- a/samples/sockets/sockets_baseclient.dsp
+++ b/samples/sockets/sockets_baseclient.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\baseclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\baseclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\baseclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\baseclient"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/samples/sockets/sockets_baseserver.dsp b/samples/sockets/sockets_baseserver.dsp
index 5964000d5c4955edc13e5cfd9e402d0e893894e8..a8c00b7da80bcd92e061e6161e695664d2000e71 100644 (file)
--- a/samples/sockets/sockets_baseserver.dsp
+++ b/samples/sockets/sockets_baseserver.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\baseserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\baseserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\baseserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\baseserver"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/samples/sockets/sockets_client.dsp b/samples/sockets/sockets_client.dsp
index ad12de073904360af02bf70eed2d633f53f526f6..213404365d16fd03f06010bdc5cf52d2f09e4360 100644 (file)
--- a/samples/sockets/sockets_client.dsp
+++ b/samples/sockets/sockets_client.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\client"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\client"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\client"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\client"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/sockets/sockets_server.dsp b/samples/sockets/sockets_server.dsp
index e8d77693583d65d68c2c608bae35e7ded52bffff..9d15c5d9ea2b0f781fe99f217f6175cf693430e0 100644 (file)
--- a/samples/sockets/sockets_server.dsp
+++ b/samples/sockets/sockets_server.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\server"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\server"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\server"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\server"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/sockets/sockets_vc7_baseclient.vcproj b/samples/sockets/sockets_vc7_baseclient.vcproj
index f87f113113ff7f7aa77040bc87ee39fef75d92b4..ee6032cde72b77507ef68f0d80e4c7170f422298 100644 (file)
--- a/samples/sockets/sockets_vc7_baseclient.vcproj
+++ b/samples/sockets/sockets_vc7_baseclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\baseclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\baseclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\baseclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/samples/sockets/sockets_vc7_baseserver.vcproj b/samples/sockets/sockets_vc7_baseserver.vcproj
index 02e4c631e42ece7ef31a1c6702dbe22c76bcfeb8..ac8eca08f933a33e30461d829e7c4069e1f5748b 100644 (file)
--- a/samples/sockets/sockets_vc7_baseserver.vcproj
+++ b/samples/sockets/sockets_vc7_baseserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\baseserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\baseserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\baseserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/samples/sockets/sockets_vc7_client.vcproj b/samples/sockets/sockets_vc7_client.vcproj
index 771594226449575c59f74d11797ad036bc999324..05d30b5314a5323bd0e7f7da48040a00335f15c8 100644 (file)
--- a/samples/sockets/sockets_vc7_client.vcproj
+++ b/samples/sockets/sockets_vc7_client.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\client.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\client.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\client.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\client.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/sockets/sockets_vc7_server.vcproj b/samples/sockets/sockets_vc7_server.vcproj
index 8d680b053d9fd1f6fa2bbdfc70028668902d4dc3..4ac39c8d04632881716736a8ecd6b3546002ebd3 100644 (file)
--- a/samples/sockets/sockets_vc7_server.vcproj
+++ b/samples/sockets/sockets_vc7_server.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\server.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\server.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\server.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\server.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/sockets/sockets_vc8_baseclient.vcproj b/samples/sockets/sockets_vc8_baseclient.vcproj
index 735c3bd0401519ff43f06a866a75e21866862cd5..2f9eac1c9db819eddadafe042af855caaef02a26 100644 (file)
--- a/samples/sockets/sockets_vc8_baseclient.vcproj
+++ b/samples/sockets/sockets_vc8_baseclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc8_baseserver.vcproj b/samples/sockets/sockets_vc8_baseserver.vcproj
index 004187fc07d9c15c8d0086e5b952e6a764e0acf6..26da11bf6948719c44dc552ef145905a3ce32f11 100644 (file)
--- a/samples/sockets/sockets_vc8_baseserver.vcproj
+++ b/samples/sockets/sockets_vc8_baseserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj
index 5e5901ddc5e4ccf3e45261075ea3161d8201c756..560521a99399a3ee967f0ae5875c4aa6f8ad6e78 100644 (file)
--- a/samples/sockets/sockets_vc8_client.vcproj
+++ b/samples/sockets/sockets_vc8_client.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj
index d156c3f68c4ee2f13f903f31d98644a28a525e7a..c55459a11b4e4f0dbb8d344848948500a278d4e3 100644 (file)
--- a/samples/sockets/sockets_vc8_server.vcproj
+++ b/samples/sockets/sockets_vc8_server.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc9_baseclient.vcproj b/samples/sockets/sockets_vc9_baseclient.vcproj
index ab9be7da938299648bae2857b6c38ac7c8be77fa..e2a0ba758c76f780d5b5b203d3838023311316ed 100644 (file)
--- a/samples/sockets/sockets_vc9_baseclient.vcproj
+++ b/samples/sockets/sockets_vc9_baseclient.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseclient.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc9_baseserver.vcproj b/samples/sockets/sockets_vc9_baseserver.vcproj
index b2d8f4d8c2f980423ba87268053b558d81f403b9..46c969f6289b87c4011bdde98cb4cd3c0201f09a 100644 (file)
--- a/samples/sockets/sockets_vc9_baseserver.vcproj
+++ b/samples/sockets/sockets_vc9_baseserver.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\baseserver.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc9_client.vcproj b/samples/sockets/sockets_vc9_client.vcproj
index ef7d4c0c253b5b7317f6ef7f68779d0d2a2a31b9..2ea50de0bf77871c6e3e2dceda1096474db5bc3c 100644 (file)
--- a/samples/sockets/sockets_vc9_client.vcproj
+++ b/samples/sockets/sockets_vc9_client.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\client.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\client.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sockets/sockets_vc9_server.vcproj b/samples/sockets/sockets_vc9_server.vcproj
index e1e1a55e0fb2c50a372c4d332cc61be6c9531876..2837d33ccb6b0aa738791902cae1711f45ba7b85 100644 (file)
--- a/samples/sockets/sockets_vc9_server.vcproj
+++ b/samples/sockets/sockets_vc9_server.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\server.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\server.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 7adbaf205549a9766f5c60d4d2ddeb684f67e544..dab28df5963d38819b7c7a6dbba017fa4f22ecba 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index ef7c7c4d418b8e12176964ad0d97aa1b610dfccd..3b6e49ce053c14de5cdbcf25e3daa2ae9b4f25fc 100644 (file)
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SOUND_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SOUND_OBJECTS =  \\r
-       $(OBJS)\sound_sound.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sound.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe\r
-       -if exist $(OBJS)\sound.tds del $(OBJS)\sound.tds\r
-       -if exist $(OBJS)\sound.ilc del $(OBJS)\sound.ilc\r
-       -if exist $(OBJS)\sound.ild del $(OBJS)\sound.ild\r
-       -if exist $(OBJS)\sound.ilf del $(OBJS)\sound.ilf\r
-       -if exist $(OBJS)\sound.ils del $(OBJS)\sound.ils\r
-\r
-$(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sound.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\sound_sound.obj: .\sound.cpp\r
-       $(CXX) -q -c -P -o$@ $(SOUND_CXXFLAGS) .\sound.cpp\r
-\r
-$(OBJS)\sound_sound.res: .\sound.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\sound.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SOUND_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SOUND_OBJECTS =  \
+       $(OBJS)\sound_sound.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sound.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
+       -if exist $(OBJS)\sound.tds del $(OBJS)\sound.tds
+       -if exist $(OBJS)\sound.ilc del $(OBJS)\sound.ilc
+       -if exist $(OBJS)\sound.ild del $(OBJS)\sound.ild
+       -if exist $(OBJS)\sound.ilf del $(OBJS)\sound.ilf
+       -if exist $(OBJS)\sound.ils del $(OBJS)\sound.ils
+
+$(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sound.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\sound_sound.obj: .\sound.cpp
+       $(CXX) -q -c -P -o$@ $(SOUND_CXXFLAGS) .\sound.cpp
+
+$(OBJS)\sound_sound.res: .\sound.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\sound.rc
+

diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 9de521d3725d5edbfb2fc1297634c5638d5e610c..ebb69bdd59ed4823e8e72b2a75b2c8f3abecb971 100644 (file)
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -1,234 +1,234 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SOUND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SOUND_OBJECTS =  \\r
-       $(OBJS)\sound_sound.o \\r
-       $(OBJS)\sound_sound_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sound.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe\r
-\r
-$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o\r
-       $(CXX) -o $@ $(SOUND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\sound_sound.o: ./sound.cpp\r
-       $(CXX) -c -o $@ $(SOUND_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\sound_sound_rc.o: ./sound.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SOUND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SOUND_OBJECTS =  \
+       $(OBJS)\sound_sound.o \
+       $(OBJS)\sound_sound_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sound.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
+
+$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o
+       $(CXX) -o $@ $(SOUND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\sound_sound.o: ./sound.cpp
+       $(CXX) -c -o $@ $(SOUND_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\sound_sound_rc.o: ./sound.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx
index 4eb527837eb43847d6ec421c55bbbb08af9c2812..487c4e08310dd780369b407a68fc460d5ebc0e38 100644 (file)
--- a/samples/sound/makefile.unx
+++ b/samples/sound/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index ac91517ab2dc4516f440473781da1fd79c97bb70..67554d6b4400ab219bcbca116765d431fbcb8390 100644 (file)
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -1,319 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SOUND_OBJECTS =  \\r
-       $(OBJS)\sound_sound.obj \\r
-       $(OBJS)\sound_sound.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\sound.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe\r
-       -if exist $(OBJS)\sound.ilk del $(OBJS)\sound.ilk\r
-       -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb\r
-\r
-$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SOUND_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\sound_sound.obj: .\sound.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SOUND_CXXFLAGS) .\sound.cpp\r
-\r
-$(OBJS)\sound_sound.res: .\sound.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sound.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SOUND_OBJECTS =  \
+       $(OBJS)\sound_sound.obj
+SOUND_RESOURCES =  \
+       $(OBJS)\sound_sound.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\sound.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
+       -if exist $(OBJS)\sound.ilk del $(OBJS)\sound.ilk
+       -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb
+
+$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SOUND_OBJECTS) $(SOUND_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\sound_sound.obj: .\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SOUND_CXXFLAGS) .\sound.cpp
+
+$(OBJS)\sound_sound.res: .\sound.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sound.rc
+

diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index fbb392f26b0abf022702f6e4324e6911f1da65bc..07aab13e77a297d6d2de5c24da956ec524d3a2fa 100644 (file)
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -1,269 +1,269 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SOUND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SOUND_OBJECTS =  &\r
-       $(OBJS)\sound_sound.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\sound.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe\r
-\r
-$(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sound.res\r
-       @%create $(OBJS)\sound.lbc\r
-       @%append $(OBJS)\sound.lbc option quiet\r
-       @%append $(OBJS)\sound.lbc name $^@\r
-       @%append $(OBJS)\sound.lbc option caseexact\r
-       @%append $(OBJS)\sound.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sound.lbc library %i\r
-       @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res\r
-       @for %i in () do @%append $(OBJS)\sound.lbc option stack=%i\r
-       wlink @$(OBJS)\sound.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\sound_sound.obj :  .AUTODEPEND .\sound.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $<\r
-\r
-$(OBJS)\sound_sound.res :  .AUTODEPEND .\sound.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SOUND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SOUND_OBJECTS =  &
+       $(OBJS)\sound_sound.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\sound.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
+
+$(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
+       @%create $(OBJS)\sound.lbc
+       @%append $(OBJS)\sound.lbc option quiet
+       @%append $(OBJS)\sound.lbc name $^@
+       @%append $(OBJS)\sound.lbc option caseexact
+       @%append $(OBJS)\sound.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sound.lbc library %i
+       @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res
+       @for %i in () do @%append $(OBJS)\sound.lbc option stack=%i
+       wlink @$(OBJS)\sound.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\sound_sound.obj :  .AUTODEPEND .\sound.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $<
+
+$(OBJS)\sound_sound.res :  .AUTODEPEND .\sound.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/sound/sound.dsp b/samples/sound/sound.dsp
index 171d07c2bda753fbac84d074f96bd963e68299c5..bafdf1bdd575fb46b49109979131e3bf3a6bb174 100644 (file)
--- a/samples/sound/sound.dsp
+++ b/samples/sound/sound.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\sound"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\sound"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\sound"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\sound"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/sound/sound_vc7.vcproj b/samples/sound/sound_vc7.vcproj
index 5bc088a250486b3c288e7c5743bdff45894e1161..417fafb1ef2395c04c02c8a44a5c74b0ec22c4e6 100644 (file)
--- a/samples/sound/sound_vc7.vcproj
+++ b/samples/sound/sound_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\sound.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\sound.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\sound.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\sound.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/sound/sound_vc8.vcproj b/samples/sound/sound_vc8.vcproj
index a14d86e27d40b73780b906c24a500d49ac1dfc7e..6fc552222f48d205ba682678b96fd55631240e45 100644 (file)
--- a/samples/sound/sound_vc8.vcproj
+++ b/samples/sound/sound_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/sound/sound_vc9.vcproj b/samples/sound/sound_vc9.vcproj
index 1bfd9b7b2b49c37414ca4349d0bd2898189886fd..a3875847519469b13a453e0de621fea08a515476 100644 (file)
--- a/samples/sound/sound_vc9.vcproj
+++ b/samples/sound/sound_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\sound.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\sound.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 66f59ad0cd65ede1f6cf4709559bdb2466515f67..03bc4a9c9fe99c0650eeb3be1b13fb40d4df5413 100644 (file)
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc
index 402315d035fd88c5d41146810c029413e4ec1747..06cc7e84f4c79579043dbc23cb11e1ba534a76e8 100644 (file)
--- a/samples/splash/makefile.bcc
+++ b/samples/splash/makefile.bcc
@@ -1,244 +1,244 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLASH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SPLASH_OBJECTS =  \\r
-       $(OBJS)\splash_splash.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"\r
-__WXLIB_MEDIA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splash.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe\r
-       -if exist $(OBJS)\splash.tds del $(OBJS)\splash.tds\r
-       -if exist $(OBJS)\splash.ilc del $(OBJS)\splash.ilc\r
-       -if exist $(OBJS)\splash.ild del $(OBJS)\splash.ild\r
-       -if exist $(OBJS)\splash.ilf del $(OBJS)\splash.ilf\r
-       -if exist $(OBJS)\splash.ils del $(OBJS)\splash.ils\r
-\r
-$(OBJS)\splash.exe: $(SPLASH_OBJECTS)  $(OBJS)\splash_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SPLASH_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splash_sample.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\splash_splash.obj: .\splash.cpp\r
-       $(CXX) -q -c -P -o$@ $(SPLASH_CXXFLAGS) .\splash.cpp\r
-\r
-$(OBJS)\splash_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLASH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SPLASH_OBJECTS =  \
+       $(OBJS)\splash_splash.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splash.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
+       -if exist $(OBJS)\splash.tds del $(OBJS)\splash.tds
+       -if exist $(OBJS)\splash.ilc del $(OBJS)\splash.ilc
+       -if exist $(OBJS)\splash.ild del $(OBJS)\splash.ild
+       -if exist $(OBJS)\splash.ilf del $(OBJS)\splash.ilf
+       -if exist $(OBJS)\splash.ils del $(OBJS)\splash.ils
+
+$(OBJS)\splash.exe: $(SPLASH_OBJECTS)  $(OBJS)\splash_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SPLASH_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splash_sample.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\splash_splash.obj: .\splash.cpp
+       $(CXX) -q -c -P -o$@ $(SPLASH_CXXFLAGS) .\splash.cpp
+
+$(OBJS)\splash_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc
index ede6333c51f52f979b8ac67f1f1f93da381e25e1..e9551c4fee8eaebe386f39f84b20f46bcfad824c 100644 (file)
--- a/samples/splash/makefile.gcc
+++ b/samples/splash/makefile.gcc
@@ -1,240 +1,240 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLASH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SPLASH_OBJECTS =  \\r
-       $(OBJS)\splash_splash.o \\r
-       $(OBJS)\splash_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-ifeq ($(USE_MEDIA),1)\r
-__WXLIB_MEDIA_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media\r
-endif\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splash.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe\r
-\r
-$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample_rc.o\r
-       $(CXX) -o $@ $(SPLASH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (splash.png press.mpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\splash_splash.o: ./splash.cpp\r
-       $(CXX) -c -o $@ $(SPLASH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\splash_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLASH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SPLASH_OBJECTS =  \
+       $(OBJS)\splash_splash.o \
+       $(OBJS)\splash_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_MEDIA),1)
+__WXLIB_MEDIA_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splash.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
+
+$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample_rc.o
+       $(CXX) -o $@ $(SPLASH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (splash.png press.mpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\splash_splash.o: ./splash.cpp
+       $(CXX) -c -o $@ $(SPLASH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\splash_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx
index c902bcba87efa5767e5e84afaa082351b5fff893..4162c86e2b637ee195063c7b73ff73355d99ae72 100644 (file)
--- a/samples/splash/makefile.unx
+++ b/samples/splash/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 04b16a494ab98788aae67d597d38ff2d060ed2fe..fccb91bf121a5956cc2c285254a060fe56368306 100644 (file)
--- a/samples/splash/makefile.vc
+++ b/samples/splash/makefile.vc
@@ -1,323 +1,348 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SPLASH_OBJECTS =  \\r
-       $(OBJS)\splash_splash.obj \\r
-       $(OBJS)\splash_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"\r
-__WXLIB_MEDIA_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splash.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe\r
-       -if exist $(OBJS)\splash.ilk del $(OBJS)\splash.ilk\r
-       -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb\r
-\r
-$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SPLASH_OBJECTS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\splash_splash.obj: .\splash.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SPLASH_CXXFLAGS) .\splash.cpp\r
-\r
-$(OBJS)\splash_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SPLASH_OBJECTS =  \
+       $(OBJS)\splash_splash.obj
+SPLASH_RESOURCES =  \
+       $(OBJS)\splash_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splash.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
+       -if exist $(OBJS)\splash.ilk del $(OBJS)\splash.ilk
+       -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb
+
+$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SPLASH_OBJECTS) $(SPLASH_RESOURCES)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\splash_splash.obj: .\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SPLASH_CXXFLAGS) .\splash.cpp
+
+$(OBJS)\splash_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat
index d2e2db0930eae60dff86c09fef3de077d65597a3..04d2f27c7a20364f22985a8bd87e3aabdd84a838 100644 (file)
--- a/samples/splash/makefile.wat
+++ b/samples/splash/makefile.wat
@@ -1,276 +1,276 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_MEDIA_p =\r
-!ifeq MONOLITHIC 0\r
-!ifeq USE_MEDIA 1\r
-__WXLIB_MEDIA_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
-!endif\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SPLASH_OBJECTS =  &\r
-       $(OBJS)\splash_splash.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\splash.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe\r
-\r
-$(OBJS)\splash.exe :  $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res\r
-       @%create $(OBJS)\splash.lbc\r
-       @%append $(OBJS)\splash.lbc option quiet\r
-       @%append $(OBJS)\splash.lbc name $^@\r
-       @%append $(OBJS)\splash.lbc option caseexact\r
-       @%append $(OBJS)\splash.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i\r
-       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splash.lbc library %i\r
-       @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res\r
-       @for %i in () do @%append $(OBJS)\splash.lbc option stack=%i\r
-       wlink @$(OBJS)\splash.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\splash_splash.obj :  .AUTODEPEND .\splash.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SPLASH_CXXFLAGS) $<\r
-\r
-$(OBJS)\splash_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_MEDIA_p =
+!ifeq MONOLITHIC 0
+!ifeq USE_MEDIA 1
+__WXLIB_MEDIA_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SPLASH_OBJECTS =  &
+       $(OBJS)\splash_splash.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\splash.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
+
+$(OBJS)\splash.exe :  $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
+       @%create $(OBJS)\splash.lbc
+       @%append $(OBJS)\splash.lbc option quiet
+       @%append $(OBJS)\splash.lbc name $^@
+       @%append $(OBJS)\splash.lbc option caseexact
+       @%append $(OBJS)\splash.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i
+       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splash.lbc library %i
+       @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res
+       @for %i in () do @%append $(OBJS)\splash.lbc option stack=%i
+       wlink @$(OBJS)\splash.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\splash_splash.obj :  .AUTODEPEND .\splash.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SPLASH_CXXFLAGS) $<
+
+$(OBJS)\splash_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/splash/splash.dsp b/samples/splash/splash.dsp
index 6baa6de55861dd2083e4d248ab9939a0c926eb38..87bbac2f8fe6df3d9233f4ba65b030207c37a42e 100644 (file)
--- a/samples/splash/splash.dsp
+++ b/samples/splash/splash.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\splash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\splash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\splash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\splash"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/splash/splash_vc7.vcproj b/samples/splash/splash_vc7.vcproj
index ab02005777d500ca27d3999b4dcfd34700d8d390..0d740afc642a52c07f969cb83e95939b9dda305d 100644 (file)
--- a/samples/splash/splash_vc7.vcproj
+++ b/samples/splash/splash_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\splash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\splash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\splash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\splash.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/splash/splash_vc8.vcproj b/samples/splash/splash_vc8.vcproj
index e2f72589e2143b2c2df1e61f80c5a90059951ca6..92e247946d4b54cf387014b70119b3a3324eb946 100644 (file)
--- a/samples/splash/splash_vc8.vcproj
+++ b/samples/splash/splash_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/splash/splash_vc9.vcproj b/samples/splash/splash_vc9.vcproj
index 1cc56275dd20c30360e22082b2031bae6cdeb24f..3bb3de256d6f573aa672d1af5ca04da2921b8e71 100644 (file)
--- a/samples/splash/splash_vc9.vcproj
+++ b/samples/splash/splash_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splash.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\splash.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index e4c31a347ec5fa0c3700d2ed18cdeffe7742ebf0..e77968e84bf777348bd000f9c639384d28af1da6 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index c08c645ea176e1fc8c347e0b12b1e18694a2535c..ab0f76cad3078f737f472764d453724df674319c 100644 (file)
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLITTER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SPLITTER_OBJECTS =  \\r
-       $(OBJS)\splitter_splitter.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splitter.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
-       -if exist $(OBJS)\splitter.tds del $(OBJS)\splitter.tds\r
-       -if exist $(OBJS)\splitter.ilc del $(OBJS)\splitter.ilc\r
-       -if exist $(OBJS)\splitter.ild del $(OBJS)\splitter.ild\r
-       -if exist $(OBJS)\splitter.ilf del $(OBJS)\splitter.ilf\r
-       -if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils\r
-\r
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS)  $(OBJS)\splitter_splitter.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_splitter.res\r
-|\r
-\r
-$(OBJS)\splitter_splitter.obj: .\splitter.cpp\r
-       $(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
-\r
-$(OBJS)\splitter_splitter.res: .\splitter.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\splitter.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLITTER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SPLITTER_OBJECTS =  \
+       $(OBJS)\splitter_splitter.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splitter.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
+       -if exist $(OBJS)\splitter.tds del $(OBJS)\splitter.tds
+       -if exist $(OBJS)\splitter.ilc del $(OBJS)\splitter.ilc
+       -if exist $(OBJS)\splitter.ild del $(OBJS)\splitter.ild
+       -if exist $(OBJS)\splitter.ilf del $(OBJS)\splitter.ilf
+       -if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils
+
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS)  $(OBJS)\splitter_splitter.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_splitter.res
+|
+
+$(OBJS)\splitter_splitter.obj: .\splitter.cpp
+       $(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp
+
+$(OBJS)\splitter_splitter.res: .\splitter.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\splitter.rc
+

diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index cdff0816664e19316fd8696bf20ac88d80b6856c..ee43d71c51bb18d5104252ac55053384b7f851f9 100644 (file)
--- a/samples/splitter/makefile.gcc
+++ b/samples/splitter/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLITTER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SPLITTER_OBJECTS =  \\r
-       $(OBJS)\splitter_splitter.o \\r
-       $(OBJS)\splitter_splitter_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splitter.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
-\r
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o\r
-       $(CXX) -o $@ $(SPLITTER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\splitter_splitter.o: ./splitter.cpp\r
-       $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\splitter_splitter_rc.o: ./splitter.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLITTER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SPLITTER_OBJECTS =  \
+       $(OBJS)\splitter_splitter.o \
+       $(OBJS)\splitter_splitter_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splitter.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
+
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o
+       $(CXX) -o $@ $(SPLITTER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\splitter_splitter.o: ./splitter.cpp
+       $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\splitter_splitter_rc.o: ./splitter.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx
index c249a23e54c01d324eb120d130b2323d1c38ec87..473b3a29d1c87b348fbef818cec5a57d05ed0098 100644 (file)
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index 730733da54344f695fa577f1eca606826df9a545..885a9d86800c7f3798ce5681c0c495a776f750c9 100644 (file)
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SPLITTER_OBJECTS =  \\r
-       $(OBJS)\splitter_splitter.obj \\r
-       $(OBJS)\splitter_splitter.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\splitter.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
-       -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk\r
-       -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb\r
-\r
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SPLITTER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\splitter_splitter.obj: .\splitter.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
-\r
-$(OBJS)\splitter_splitter.res: .\splitter.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\splitter.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SPLITTER_OBJECTS =  \
+       $(OBJS)\splitter_splitter.obj
+SPLITTER_RESOURCES =  \
+       $(OBJS)\splitter_splitter.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\splitter.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
+       -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk
+       -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb
+
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SPLITTER_OBJECTS) $(SPLITTER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\splitter_splitter.obj: .\splitter.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp
+
+$(OBJS)\splitter_splitter.res: .\splitter.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\splitter.rc
+

diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index 0cd238b72ff77a83c34b5ce40a9fd3ad5df86aaa..c23e63f399aeffc6051baf3c61206a6aa0449550 100644 (file)
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SPLITTER_OBJECTS =  &\r
-       $(OBJS)\splitter_splitter.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\splitter.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
-\r
-$(OBJS)\splitter.exe :  $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res\r
-       @%create $(OBJS)\splitter.lbc\r
-       @%append $(OBJS)\splitter.lbc option quiet\r
-       @%append $(OBJS)\splitter.lbc name $^@\r
-       @%append $(OBJS)\splitter.lbc option caseexact\r
-       @%append $(OBJS)\splitter.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splitter.lbc library %i\r
-       @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res\r
-       @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i\r
-       wlink @$(OBJS)\splitter.lbc\r
-\r
-$(OBJS)\splitter_splitter.obj :  .AUTODEPEND .\splitter.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $<\r
-\r
-$(OBJS)\splitter_splitter.res :  .AUTODEPEND .\splitter.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SPLITTER_OBJECTS =  &
+       $(OBJS)\splitter_splitter.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\splitter.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
+
+$(OBJS)\splitter.exe :  $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
+       @%create $(OBJS)\splitter.lbc
+       @%append $(OBJS)\splitter.lbc option quiet
+       @%append $(OBJS)\splitter.lbc name $^@
+       @%append $(OBJS)\splitter.lbc option caseexact
+       @%append $(OBJS)\splitter.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splitter.lbc library %i
+       @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res
+       @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i
+       wlink @$(OBJS)\splitter.lbc
+
+$(OBJS)\splitter_splitter.obj :  .AUTODEPEND .\splitter.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $<
+
+$(OBJS)\splitter_splitter.res :  .AUTODEPEND .\splitter.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/splitter/splitter.dsp b/samples/splitter/splitter.dsp
index db05f3ae4411270734067e072b8ca97611ad1d56..b29f31768b2f0963fc0fca95cc29b52f4d039fe8 100644 (file)
--- a/samples/splitter/splitter.dsp
+++ b/samples/splitter/splitter.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\splitter"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\splitter"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\splitter"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\splitter"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj
index 866833f977d36c6da1160b09c5bb239136bad4f5..e9c4cf8d82b0176596c5c0e45e53c57ad408ad70 100644 (file)
--- a/samples/splitter/splitter_vc7.vcproj
+++ b/samples/splitter/splitter_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\splitter.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\splitter.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\splitter.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\splitter.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj
index 618ad2cf139d7b222a4852ab61cd3ee89fce3b63..3604d6dd2de98bacc11b227ccc017492a2b1c78c 100644 (file)
--- a/samples/splitter/splitter_vc8.vcproj
+++ b/samples/splitter/splitter_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/splitter/splitter_vc9.vcproj b/samples/splitter/splitter_vc9.vcproj
index d56c5e77b135181625f8b853504825765cd12f86..24396a5f6b9077df1c3ff5ac7058556947b1f75d 100644 (file)
--- a/samples/splitter/splitter_vc9.vcproj
+++ b/samples/splitter/splitter_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\splitter.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\splitter.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 8cddc2e1f843fd8e9a086f59f87c7302c90e1db6..1f2d16b7acccaa489ada40b271780f18c48b0221 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index 1602812e7a647b8f45d5c06901c9befa7a6dcb52..29dc184d6b4da4266d15a82d9b4a970f7dd97580 100644 (file)
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STATBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-STATBAR_OBJECTS =  \\r
-       $(OBJS)\statbar_statbar.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\statbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
-       -if exist $(OBJS)\statbar.tds del $(OBJS)\statbar.tds\r
-       -if exist $(OBJS)\statbar.ilc del $(OBJS)\statbar.ilc\r
-       -if exist $(OBJS)\statbar.ild del $(OBJS)\statbar.ild\r
-       -if exist $(OBJS)\statbar.ilf del $(OBJS)\statbar.ilf\r
-       -if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils\r
-\r
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS)  $(OBJS)\statbar_statbar.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_statbar.res\r
-|\r
-\r
-$(OBJS)\statbar_statbar.obj: .\statbar.cpp\r
-       $(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
-\r
-$(OBJS)\statbar_statbar.res: .\statbar.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\statbar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STATBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+STATBAR_OBJECTS =  \
+       $(OBJS)\statbar_statbar.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\statbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
+       -if exist $(OBJS)\statbar.tds del $(OBJS)\statbar.tds
+       -if exist $(OBJS)\statbar.ilc del $(OBJS)\statbar.ilc
+       -if exist $(OBJS)\statbar.ild del $(OBJS)\statbar.ild
+       -if exist $(OBJS)\statbar.ilf del $(OBJS)\statbar.ilf
+       -if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils
+
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS)  $(OBJS)\statbar_statbar.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_statbar.res
+|
+
+$(OBJS)\statbar_statbar.obj: .\statbar.cpp
+       $(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) .\statbar.cpp
+
+$(OBJS)\statbar_statbar.res: .\statbar.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\statbar.rc
+

diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index 14cf4ca77f5c6a24e82c2e79a43957cea4887514..6c8faf01c13cf78ae2da85d6a9f60c2d801b4619 100644 (file)
--- a/samples/statbar/makefile.gcc
+++ b/samples/statbar/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STATBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-STATBAR_OBJECTS =  \\r
-       $(OBJS)\statbar_statbar.o \\r
-       $(OBJS)\statbar_statbar_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\statbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
-\r
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o\r
-       $(CXX) -o $@ $(STATBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\statbar_statbar.o: ./statbar.cpp\r
-       $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\statbar_statbar_rc.o: ./statbar.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STATBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+STATBAR_OBJECTS =  \
+       $(OBJS)\statbar_statbar.o \
+       $(OBJS)\statbar_statbar_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\statbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
+
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o
+       $(CXX) -o $@ $(STATBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\statbar_statbar.o: ./statbar.cpp
+       $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\statbar_statbar_rc.o: ./statbar.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx
index b907a8766d08b4747870c797e624e0c5cfddd338..a530a7eb86e306ea22a81d528150e5b075212df0 100644 (file)
--- a/samples/statbar/makefile.unx
+++ b/samples/statbar/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index 7aa187c8b90527826b005b4c9346e6ebd461657a..db81524f048f5ff330aa49b3f6aa9bd711f1e97d 100644 (file)
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-STATBAR_OBJECTS =  \\r
-       $(OBJS)\statbar_statbar.obj \\r
-       $(OBJS)\statbar_statbar.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\statbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
-       -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk\r
-       -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb\r
-\r
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(STATBAR_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\statbar_statbar.obj: .\statbar.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
-\r
-$(OBJS)\statbar_statbar.res: .\statbar.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\statbar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+STATBAR_OBJECTS =  \
+       $(OBJS)\statbar_statbar.obj
+STATBAR_RESOURCES =  \
+       $(OBJS)\statbar_statbar.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\statbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
+       -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk
+       -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb
+
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(STATBAR_OBJECTS) $(STATBAR_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\statbar_statbar.obj: .\statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp
+
+$(OBJS)\statbar_statbar.res: .\statbar.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\statbar.rc
+

diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index 702fbbeed304141c7d7dff132cd5f6331a8765f0..b2d898edfc6eb27263837dd7bbbd502386850ba6 100644 (file)
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-STATBAR_OBJECTS =  &\r
-       $(OBJS)\statbar_statbar.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\statbar.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
-\r
-$(OBJS)\statbar.exe :  $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res\r
-       @%create $(OBJS)\statbar.lbc\r
-       @%append $(OBJS)\statbar.lbc option quiet\r
-       @%append $(OBJS)\statbar.lbc name $^@\r
-       @%append $(OBJS)\statbar.lbc option caseexact\r
-       @%append $(OBJS)\statbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\statbar.lbc library %i\r
-       @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res\r
-       @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i\r
-       wlink @$(OBJS)\statbar.lbc\r
-\r
-$(OBJS)\statbar_statbar.obj :  .AUTODEPEND .\statbar.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $<\r
-\r
-$(OBJS)\statbar_statbar.res :  .AUTODEPEND .\statbar.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+STATBAR_OBJECTS =  &
+       $(OBJS)\statbar_statbar.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\statbar.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
+
+$(OBJS)\statbar.exe :  $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
+       @%create $(OBJS)\statbar.lbc
+       @%append $(OBJS)\statbar.lbc option quiet
+       @%append $(OBJS)\statbar.lbc name $^@
+       @%append $(OBJS)\statbar.lbc option caseexact
+       @%append $(OBJS)\statbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\statbar.lbc library %i
+       @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res
+       @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i
+       wlink @$(OBJS)\statbar.lbc
+
+$(OBJS)\statbar_statbar.obj :  .AUTODEPEND .\statbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $<
+
+$(OBJS)\statbar_statbar.res :  .AUTODEPEND .\statbar.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/statbar/statbar.dsp b/samples/statbar/statbar.dsp
index aa583bcdd9c2942ddbb525cc9460ab4a816b8220..74abafc85ebf5febd2d79824c514e338076abc66 100644 (file)
--- a/samples/statbar/statbar.dsp
+++ b/samples/statbar/statbar.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\statbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\statbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\statbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\statbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj
index fa9033ee58bb297eabc8e9c8930dc21cd4ee81fa..39e174dbf59dd47221d2df7e999ee704516a5546 100644 (file)
--- a/samples/statbar/statbar_vc7.vcproj
+++ b/samples/statbar/statbar_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\statbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\statbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\statbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\statbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/statbar/statbar_vc8.vcproj b/samples/statbar/statbar_vc8.vcproj
index 5e72118a1c74ad6f0bc353cb1e563ca5db403373..fbb345d3ec68d860b82d64159c225660227026c7 100644 (file)
--- a/samples/statbar/statbar_vc8.vcproj
+++ b/samples/statbar/statbar_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/statbar/statbar_vc9.vcproj b/samples/statbar/statbar_vc9.vcproj
index 532a6d39834ef0ec136d79db107cdc38444917ed..64c26eafbc96ffcbc94f60d10abe6fc2ac2e4575 100644 (file)
--- a/samples/statbar/statbar_vc9.vcproj
+++ b/samples/statbar/statbar_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\statbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\statbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index a537da1c867c03a8b573a39c1a552b3c75e261ef..18b01e9fb355de3e2821a5d73352684798bb5171 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
index f1921be8c9354be35efb66a49189ce0a1ac24ccd..80a6c740eaf370922220beb8fdcb53c37642103c 100644 (file)
--- a/samples/stc/makefile.bcc
+++ b/samples/stc/makefile.bcc
@@ -1,248 +1,248 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STCTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-STCTEST_OBJECTS =  \\r
-       $(OBJS)\stctest_stctest.obj \\r
-       $(OBJS)\stctest_edit.obj \\r
-       $(OBJS)\stctest_prefs.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_STC_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\stctest.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe\r
-       -if exist $(OBJS)\stctest.tds del $(OBJS)\stctest.tds\r
-       -if exist $(OBJS)\stctest.ilc del $(OBJS)\stctest.ilc\r
-       -if exist $(OBJS)\stctest.ild del $(OBJS)\stctest.ild\r
-       -if exist $(OBJS)\stctest.ilf del $(OBJS)\stctest.ilf\r
-       -if exist $(OBJS)\stctest.ils del $(OBJS)\stctest.ils\r
-\r
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS)  $(OBJS)\stctest_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(STCTEST_OBJECTS),$@,, $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\stctest_stctest.obj: .\stctest.cpp\r
-       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
-\r
-$(OBJS)\stctest_edit.obj: .\edit.cpp\r
-       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\edit.cpp\r
-\r
-$(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
-       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
-\r
-$(OBJS)\stctest_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STCTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+STCTEST_OBJECTS =  \
+       $(OBJS)\stctest_stctest.obj \
+       $(OBJS)\stctest_edit.obj \
+       $(OBJS)\stctest_prefs.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_STC_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\stctest.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
+       -if exist $(OBJS)\stctest.tds del $(OBJS)\stctest.tds
+       -if exist $(OBJS)\stctest.ilc del $(OBJS)\stctest.ilc
+       -if exist $(OBJS)\stctest.ild del $(OBJS)\stctest.ild
+       -if exist $(OBJS)\stctest.ilf del $(OBJS)\stctest.ilf
+       -if exist $(OBJS)\stctest.ils del $(OBJS)\stctest.ils
+
+$(OBJS)\stctest.exe: $(STCTEST_OBJECTS)  $(OBJS)\stctest_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(STCTEST_OBJECTS),$@,, $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\stctest_stctest.obj: .\stctest.cpp
+       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\stctest.cpp
+
+$(OBJS)\stctest_edit.obj: .\edit.cpp
+       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\edit.cpp
+
+$(OBJS)\stctest_prefs.obj: .\prefs.cpp
+       $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\prefs.cpp
+
+$(OBJS)\stctest_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index e27f9b73ecd34f42a4ec3381b67ce065b5d1e575..b42bcfc0d98f674c578728e3ad7180904ee81360 100644 (file)
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -1,242 +1,242 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-STCTEST_OBJECTS =  \\r
-       $(OBJS)\stctest_stctest.o \\r
-       $(OBJS)\stctest_edit.o \\r
-       $(OBJS)\stctest_prefs.o \\r
-       $(OBJS)\stctest_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_STC_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\stctest.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe\r
-\r
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o\r
-       $(CXX) -o $@ $(STCTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\stctest_stctest.o: ./stctest.cpp\r
-       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\stctest_edit.o: ./edit.cpp\r
-       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\stctest_prefs.o: ./prefs.cpp\r
-       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\stctest_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+STCTEST_OBJECTS =  \
+       $(OBJS)\stctest_stctest.o \
+       $(OBJS)\stctest_edit.o \
+       $(OBJS)\stctest_prefs.o \
+       $(OBJS)\stctest_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_STC_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\stctest.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
+
+$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o
+       $(CXX) -o $@ $(STCTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\stctest_stctest.o: ./stctest.cpp
+       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\stctest_edit.o: ./edit.cpp
+       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\stctest_prefs.o: ./prefs.cpp
+       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\stctest_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/stc/makefile.unx b/samples/stc/makefile.unx
index 08290b5c264890892429a1851a89294ae4cf1447..fc9cb8588b6b9949d8dcc0c2083677775aefa9db 100644 (file)
--- a/samples/stc/makefile.unx
+++ b/samples/stc/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 7beec3c788905b43442fbb61ebf4fe6b7239ddb9..e514fa85b739eb1a6673d1af94b9658607ec9a23 100644 (file)
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -1,327 +1,352 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-STCTEST_OBJECTS =  \\r
-       $(OBJS)\stctest_stctest.obj \\r
-       $(OBJS)\stctest_edit.obj \\r
-       $(OBJS)\stctest_prefs.obj \\r
-       $(OBJS)\stctest_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_STC_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\stctest.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe\r
-       -if exist $(OBJS)\stctest.ilk del $(OBJS)\stctest.ilk\r
-       -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb\r
-\r
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(STCTEST_OBJECTS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\stctest_stctest.obj: .\stctest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
-\r
-$(OBJS)\stctest_edit.obj: .\edit.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\edit.cpp\r
-\r
-$(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
-\r
-$(OBJS)\stctest_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+STCTEST_OBJECTS =  \
+       $(OBJS)\stctest_stctest.obj \
+       $(OBJS)\stctest_edit.obj \
+       $(OBJS)\stctest_prefs.obj
+STCTEST_RESOURCES =  \
+       $(OBJS)\stctest_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_STC_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\stctest.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
+       -if exist $(OBJS)\stctest.ilk del $(OBJS)\stctest.ilk
+       -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb
+
+$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(STCTEST_OBJECTS) $(STCTEST_RESOURCES)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\stctest_stctest.obj: .\stctest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp
+
+$(OBJS)\stctest_edit.obj: .\edit.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\edit.cpp
+
+$(OBJS)\stctest_prefs.obj: .\prefs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp
+
+$(OBJS)\stctest_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index 623bead30624a6367f685c6366f86c9edc9a6eef..2d867b26fd0ca5ec7e229a17439cfc8e607c153b 100644 (file)
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -1,277 +1,277 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_STC_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_STC_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-STCTEST_OBJECTS =  &\r
-       $(OBJS)\stctest_stctest.obj &\r
-       $(OBJS)\stctest_edit.obj &\r
-       $(OBJS)\stctest_prefs.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\stctest.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe\r
-\r
-$(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res\r
-       @%create $(OBJS)\stctest.lbc\r
-       @%append $(OBJS)\stctest.lbc option quiet\r
-       @%append $(OBJS)\stctest.lbc name $^@\r
-       @%append $(OBJS)\stctest.lbc option caseexact\r
-       @%append $(OBJS)\stctest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i\r
-       @for %i in ( $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\stctest.lbc library %i\r
-       @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res\r
-       @for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i\r
-       wlink @$(OBJS)\stctest.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_STC_p =
+!ifeq MONOLITHIC 0
+__WXLIB_STC_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+STCTEST_OBJECTS =  &
+       $(OBJS)\stctest_stctest.obj &
+       $(OBJS)\stctest_edit.obj &
+       $(OBJS)\stctest_prefs.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\stctest.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
+
+$(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
+       @%create $(OBJS)\stctest.lbc
+       @%append $(OBJS)\stctest.lbc option quiet
+       @%append $(OBJS)\stctest.lbc name $^@
+       @%append $(OBJS)\stctest.lbc option caseexact
+       @%append $(OBJS)\stctest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i
+       @for %i in ( $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\stctest.lbc library %i
+       @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
+       @for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i
+       wlink @$(OBJS)\stctest.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+
+$(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+
+$(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+
+$(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/stc/stctest.dsp b/samples/stc/stctest.dsp
index ecc3e19a1e320511c16a1016c425490172641cf5..db6d9824571da90423f04fc0ab0f5b31959341d1 100644 (file)
--- a/samples/stc/stctest.dsp
+++ b/samples/stc/stctest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\stctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\stctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\stctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\stctest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj
index e8cd6ed1066513957cc283f5818043eff15f8998..d455924d27dbc195f016bef071de9533ef4aee39 100644 (file)
--- a/samples/stc/stctest_vc7.vcproj
+++ b/samples/stc/stctest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\stctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\stctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\stctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\stctest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj
index 6a5f77623f0dc563fd0681b98ea48811a1b7670d..99357925313e32980028bbbbc4f9e84970f61cfc 100644 (file)
--- a/samples/stc/stctest_vc8.vcproj
+++ b/samples/stc/stctest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj
index 8ccc326b753397bef908008dd69fd99e6c68604d..23be19e4fc3a6d7d014a256aa914dd9e2d7df9e2 100644 (file)
--- a/samples/stc/stctest_vc9.vcproj
+++ b/samples/stc/stctest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_stc.lib  wxmsw29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_stc.lib  wxmswuniv29u_core.lib  wxbase29u.lib  wxscintilla.lib  wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\stctest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\stctest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 39ca9949cefa14a673b927ef555b1457a46827cc..f6c9ebb531881e9b9d626b894d588b6d333ed35b 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc
index b0d17516dd84fbe6ab5f1fffc18c4162f6907c7f..162b85c8b23bf4a24cce5340300b8dce5b33b24e 100644 (file)
--- a/samples/svg/makefile.bcc
+++ b/samples/svg/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SVGTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SVGTEST_OBJECTS =  \\r
-       $(OBJS)\svgtest_svgtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\svgtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe\r
-       -if exist $(OBJS)\svgtest.tds del $(OBJS)\svgtest.tds\r
-       -if exist $(OBJS)\svgtest.ilc del $(OBJS)\svgtest.ilc\r
-       -if exist $(OBJS)\svgtest.ild del $(OBJS)\svgtest.ild\r
-       -if exist $(OBJS)\svgtest.ilf del $(OBJS)\svgtest.ilf\r
-       -if exist $(OBJS)\svgtest.ils del $(OBJS)\svgtest.ils\r
-\r
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res\r
-|\r
-\r
-$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp\r
-       $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SVGTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SVGTEST_OBJECTS =  \
+       $(OBJS)\svgtest_svgtest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\svgtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
+       -if exist $(OBJS)\svgtest.tds del $(OBJS)\svgtest.tds
+       -if exist $(OBJS)\svgtest.ilc del $(OBJS)\svgtest.ilc
+       -if exist $(OBJS)\svgtest.ild del $(OBJS)\svgtest.ild
+       -if exist $(OBJS)\svgtest.ilf del $(OBJS)\svgtest.ilf
+       -if exist $(OBJS)\svgtest.ils del $(OBJS)\svgtest.ils
+
+$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res
+|
+
+$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
+       $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp
+

diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
index 21b7a4023e173f5e7c3b42927ebd60870b1889fc..26443a86b3065b84e9abacdd3a68c4d5328ef6b3 100644 (file)
--- a/samples/svg/makefile.gcc
+++ b/samples/svg/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SVGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SVGTEST_OBJECTS =  \\r
-       $(OBJS)\svgtest_sample_rc.o \\r
-       $(OBJS)\svgtest_svgtest.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\svgtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe\r
-\r
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o\r
-       $(CXX) -o $@ $(SVGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\svgtest_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\svgtest_svgtest.o: ./svgtest.cpp\r
-       $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SVGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SVGTEST_OBJECTS =  \
+       $(OBJS)\svgtest_sample_rc.o \
+       $(OBJS)\svgtest_svgtest.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\svgtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
+
+$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
+       $(CXX) -o $@ $(SVGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\svgtest_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\svgtest_svgtest.o: ./svgtest.cpp
+       $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx
index ae99a7b995c4f71b6e4f3452215d2b632ce76b15..64da3cfa6fff4189e2a7ac446bfd21e690fca0fb 100644 (file)
--- a/samples/svg/makefile.unx
+++ b/samples/svg/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
index e9dff0b0217043f451ef0ce782dee34f41ac3c21..d4d66f13054a89c2b76001cefa183124c9459b78 100644 (file)
--- a/samples/svg/makefile.vc
+++ b/samples/svg/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-SVGTEST_OBJECTS =  \\r
-       $(OBJS)\svgtest_sample.res \\r
-       $(OBJS)\svgtest_svgtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\svgtest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe\r
-       -if exist $(OBJS)\svgtest.ilk del $(OBJS)\svgtest.ilk\r
-       -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb\r
-\r
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SVGTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SVGTEST_OBJECTS =  \
+       $(OBJS)\svgtest_svgtest.obj
+SVGTEST_RESOURCES =  \
+       $(OBJS)\svgtest_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\svgtest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
+       -if exist $(OBJS)\svgtest.ilk del $(OBJS)\svgtest.ilk
+       -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb
+
+$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SVGTEST_OBJECTS) $(SVGTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp
+

diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat
index 71a96b88210f94aa0dc6827612b06878089661fe..dad50aab9dc358d52c397973665b6fe1e07e7002 100644 (file)
--- a/samples/svg/makefile.wat
+++ b/samples/svg/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-SVGTEST_OBJECTS =  &\r
-       $(OBJS)\svgtest_svgtest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\svgtest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe\r
-\r
-$(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res\r
-       @%create $(OBJS)\svgtest.lbc\r
-       @%append $(OBJS)\svgtest.lbc option quiet\r
-       @%append $(OBJS)\svgtest.lbc name $^@\r
-       @%append $(OBJS)\svgtest.lbc option caseexact\r
-       @%append $(OBJS)\svgtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\svgtest.lbc library %i\r
-       @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res\r
-       @for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i\r
-       wlink @$(OBJS)\svgtest.lbc\r
-\r
-$(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+SVGTEST_OBJECTS =  &
+       $(OBJS)\svgtest_svgtest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\svgtest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
+
+$(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
+       @%create $(OBJS)\svgtest.lbc
+       @%append $(OBJS)\svgtest.lbc option quiet
+       @%append $(OBJS)\svgtest.lbc name $^@
+       @%append $(OBJS)\svgtest.lbc option caseexact
+       @%append $(OBJS)\svgtest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\svgtest.lbc library %i
+       @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
+       @for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i
+       wlink @$(OBJS)\svgtest.lbc
+
+$(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
+

diff --git a/samples/svg/svgtest.dsp b/samples/svg/svgtest.dsp
index b3f0ced7b6e48229500d1d91b38c0876cb10adee..fd97d63d66805a14e7409a4eeb332e87a86d03a8 100644 (file)
--- a/samples/svg/svgtest.dsp
+++ b/samples/svg/svgtest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\svgtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\svgtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\svgtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\svgtest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/svg/svgtest_vc7.vcproj b/samples/svg/svgtest_vc7.vcproj
index c2d9625adc16828f2a77daa7ff9a298ae4e4b4c3..7c0cecd7de5697b01ce29fac1ae12371ab609955 100644 (file)
--- a/samples/svg/svgtest_vc7.vcproj
+++ b/samples/svg/svgtest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\svgtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\svgtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\svgtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\svgtest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/svg/svgtest_vc8.vcproj b/samples/svg/svgtest_vc8.vcproj
index edb79393bb8df5d584baf84cdf6a9a8b80d400d3..4d6cd55460b56b8c546d05036cae372f7b655b9f 100644 (file)
--- a/samples/svg/svgtest_vc8.vcproj
+++ b/samples/svg/svgtest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/svg/svgtest_vc9.vcproj b/samples/svg/svgtest_vc9.vcproj
index 6a0ccdee23f90846860679318e2c91369d32c073..27521a453e197031d9b69a23d4f25d475a137043 100644 (file)
--- a/samples/svg/svgtest_vc9.vcproj
+++ b/samples/svg/svgtest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\svgtest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\svgtest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index d0cf5c36a8d79beb36a6e433fc305ff579cbeaba..9306e5c9a5383ce78148cb5c5b0a2867bc05397c 100644 (file)
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc
index d135a9e1636b678f3e6e317ce35ad03eaaa5c765..b3a50e0d508a04eb2d31bc6be373aa031b0c8efc 100644 (file)
--- a/samples/taborder/makefile.bcc
+++ b/samples/taborder/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TABORDER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TABORDER_OBJECTS =  \\r
-       $(OBJS)\taborder_taborder.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taborder.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe\r
-       -if exist $(OBJS)\taborder.tds del $(OBJS)\taborder.tds\r
-       -if exist $(OBJS)\taborder.ilc del $(OBJS)\taborder.ilc\r
-       -if exist $(OBJS)\taborder.ild del $(OBJS)\taborder.ild\r
-       -if exist $(OBJS)\taborder.ilf del $(OBJS)\taborder.ilf\r
-       -if exist $(OBJS)\taborder.ils del $(OBJS)\taborder.ils\r
-\r
-$(OBJS)\taborder.exe: $(TABORDER_OBJECTS)  $(OBJS)\taborder_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TABORDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taborder_sample.res\r
-|\r
-\r
-$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\taborder_taborder.obj: .\taborder.cpp\r
-       $(CXX) -q -c -P -o$@ $(TABORDER_CXXFLAGS) .\taborder.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TABORDER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TABORDER_OBJECTS =  \
+       $(OBJS)\taborder_taborder.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taborder.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe
+       -if exist $(OBJS)\taborder.tds del $(OBJS)\taborder.tds
+       -if exist $(OBJS)\taborder.ilc del $(OBJS)\taborder.ilc
+       -if exist $(OBJS)\taborder.ild del $(OBJS)\taborder.ild
+       -if exist $(OBJS)\taborder.ilf del $(OBJS)\taborder.ilf
+       -if exist $(OBJS)\taborder.ils del $(OBJS)\taborder.ils
+
+$(OBJS)\taborder.exe: $(TABORDER_OBJECTS)  $(OBJS)\taborder_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TABORDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taborder_sample.res
+|
+
+$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\taborder_taborder.obj: .\taborder.cpp
+       $(CXX) -q -c -P -o$@ $(TABORDER_CXXFLAGS) .\taborder.cpp
+

diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc
index 55d85115654a2b32fd473d89b269b57266f37651..4e99616e9e389ba32dd46d7fa0acdbc734def53c 100644 (file)
--- a/samples/taborder/makefile.gcc
+++ b/samples/taborder/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TABORDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TABORDER_OBJECTS =  \\r
-       $(OBJS)\taborder_sample_rc.o \\r
-       $(OBJS)\taborder_taborder.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taborder.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe\r
-\r
-$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample_rc.o\r
-       $(CXX) -o $@ $(TABORDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\taborder_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\taborder_taborder.o: ./taborder.cpp\r
-       $(CXX) -c -o $@ $(TABORDER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TABORDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TABORDER_OBJECTS =  \
+       $(OBJS)\taborder_sample_rc.o \
+       $(OBJS)\taborder_taborder.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taborder.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe
+
+$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample_rc.o
+       $(CXX) -o $@ $(TABORDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\taborder_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\taborder_taborder.o: ./taborder.cpp
+       $(CXX) -c -o $@ $(TABORDER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx
index ac575333a0f68326d678212bf898d03eb9091f5c..0f28955eef3247fa9065f5d616b90f1e14c2d12e 100644 (file)
--- a/samples/taborder/makefile.unx
+++ b/samples/taborder/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc
index 5bf3d913f725ff3e811355c7c9916dc62b058ebe..7ac7a56a3f742206eb4c256284966f76311a4c3f 100644 (file)
--- a/samples/taborder/makefile.vc
+++ b/samples/taborder/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TABORDER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TABORDER_OBJECTS =  \\r
-       $(OBJS)\taborder_sample.res \\r
-       $(OBJS)\taborder_taborder.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taborder.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe\r
-       -if exist $(OBJS)\taborder.ilk del $(OBJS)\taborder.ilk\r
-       -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb\r
-\r
-$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TABORDER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\taborder_taborder.obj: .\taborder.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TABORDER_CXXFLAGS) .\taborder.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TABORDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TABORDER_OBJECTS =  \
+       $(OBJS)\taborder_taborder.obj
+TABORDER_RESOURCES =  \
+       $(OBJS)\taborder_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taborder.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe
+       -if exist $(OBJS)\taborder.ilk del $(OBJS)\taborder.ilk
+       -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb
+
+$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TABORDER_OBJECTS) $(TABORDER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\taborder_taborder.obj: .\taborder.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TABORDER_CXXFLAGS) .\taborder.cpp
+

diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat
index 561d91e48ecb4150c476c0299b723e4e6014a6b2..7154e82c9f64529815e912b37476c71667daabe1 100644 (file)
--- a/samples/taborder/makefile.wat
+++ b/samples/taborder/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TABORDER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TABORDER_OBJECTS =  &\r
-       $(OBJS)\taborder_taborder.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\taborder.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe\r
-\r
-$(OBJS)\taborder.exe :  $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res\r
-       @%create $(OBJS)\taborder.lbc\r
-       @%append $(OBJS)\taborder.lbc option quiet\r
-       @%append $(OBJS)\taborder.lbc name $^@\r
-       @%append $(OBJS)\taborder.lbc option caseexact\r
-       @%append $(OBJS)\taborder.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i\r
-       @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res\r
-       @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i\r
-       wlink @$(OBJS)\taborder.lbc\r
-\r
-$(OBJS)\taborder_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\taborder_taborder.obj :  .AUTODEPEND .\taborder.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TABORDER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TABORDER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TABORDER_OBJECTS =  &
+       $(OBJS)\taborder_taborder.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\taborder.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe
+
+$(OBJS)\taborder.exe :  $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res
+       @%create $(OBJS)\taborder.lbc
+       @%append $(OBJS)\taborder.lbc option quiet
+       @%append $(OBJS)\taborder.lbc name $^@
+       @%append $(OBJS)\taborder.lbc option caseexact
+       @%append $(OBJS)\taborder.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i
+       @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res
+       @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i
+       wlink @$(OBJS)\taborder.lbc
+
+$(OBJS)\taborder_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\taborder_taborder.obj :  .AUTODEPEND .\taborder.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TABORDER_CXXFLAGS) $<
+

diff --git a/samples/taborder/taborder.dsp b/samples/taborder/taborder.dsp
index 7f44ce1d9bc858341b88c21b87b925f80d9bcd8d..a9bc414d871a971fe1e168c667c067455ff14cdf 100644 (file)
--- a/samples/taborder/taborder.dsp
+++ b/samples/taborder/taborder.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\taborder"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\taborder"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\taborder"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\taborder"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/taborder/taborder_vc7.vcproj b/samples/taborder/taborder_vc7.vcproj
index 9a222f4bd07764007d97f502519957d7011c1998..b0aedf73bdd9492b022cf26796d9f03d1e700e2f 100644 (file)
--- a/samples/taborder/taborder_vc7.vcproj
+++ b/samples/taborder/taborder_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\taborder.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\taborder.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\taborder.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\taborder.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/taborder/taborder_vc8.vcproj b/samples/taborder/taborder_vc8.vcproj
index 6e14922e17d02d249fc77d14cd13afcefbe3e344..6d0aa9f7646bc1ddb66bf47e2c8367a1a9538f0d 100644 (file)
--- a/samples/taborder/taborder_vc8.vcproj
+++ b/samples/taborder/taborder_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/taborder/taborder_vc9.vcproj b/samples/taborder/taborder_vc9.vcproj
index 45ae60c250693cc09544fc1aa546c8a96fd8eb7d..99a0cfb64d29f1d80bb1647f8c2f4bcb00e0c1e1 100644 (file)
--- a/samples/taborder/taborder_vc9.vcproj
+++ b/samples/taborder/taborder_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taborder.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\taborder.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 3ae4ffa31d35b4aa623855645f48148f45736cad..80b976c37b2c3a56fa9ff4649a58687d26885562 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc
index c6ea283603391550b700722a3c57b204ce1d2f29..480895a103c0b83345aaff4abb6a288754edf4e6 100644 (file)
--- a/samples/taskbar/makefile.bcc
+++ b/samples/taskbar/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TASKBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TASKBAR_OBJECTS =  \\r
-       $(OBJS)\taskbar_tbtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taskbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe\r
-       -if exist $(OBJS)\taskbar.tds del $(OBJS)\taskbar.tds\r
-       -if exist $(OBJS)\taskbar.ilc del $(OBJS)\taskbar.ilc\r
-       -if exist $(OBJS)\taskbar.ild del $(OBJS)\taskbar.ild\r
-       -if exist $(OBJS)\taskbar.ilf del $(OBJS)\taskbar.ilf\r
-       -if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils\r
-\r
-$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS)  $(OBJS)\taskbar_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbar_sample.res\r
-|\r
-\r
-$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp\r
-       $(CXX) -q -c -P -o$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TASKBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TASKBAR_OBJECTS =  \
+       $(OBJS)\taskbar_tbtest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taskbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
+       -if exist $(OBJS)\taskbar.tds del $(OBJS)\taskbar.tds
+       -if exist $(OBJS)\taskbar.ilc del $(OBJS)\taskbar.ilc
+       -if exist $(OBJS)\taskbar.ild del $(OBJS)\taskbar.ild
+       -if exist $(OBJS)\taskbar.ilf del $(OBJS)\taskbar.ilf
+       -if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils
+
+$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS)  $(OBJS)\taskbar_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbar_sample.res
+|
+
+$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp
+       $(CXX) -q -c -P -o$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp
+

diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc
index c0a9e5d0db297b6fb98257e84cae1c31fbdd3e26..9ac845e2023a216b76d54613bdfbd9d90ae53a37 100644 (file)
--- a/samples/taskbar/makefile.gcc
+++ b/samples/taskbar/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TASKBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TASKBAR_OBJECTS =  \\r
-       $(OBJS)\taskbar_sample_rc.o \\r
-       $(OBJS)\taskbar_tbtest.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taskbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe\r
-\r
-$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o\r
-       $(CXX) -o $@ $(TASKBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\taskbar_tbtest.o: ./tbtest.cpp\r
-       $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TASKBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TASKBAR_OBJECTS =  \
+       $(OBJS)\taskbar_sample_rc.o \
+       $(OBJS)\taskbar_tbtest.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taskbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
+
+$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o
+       $(CXX) -o $@ $(TASKBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\taskbar_tbtest.o: ./tbtest.cpp
+       $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx
index 340109f975c7d05fb8b6e56d4ff6bd29cb3db112..055427cb30ee5db0471612e5d0e15002b0b0b42a 100644 (file)
--- a/samples/taskbar/makefile.unx
+++ b/samples/taskbar/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc
index efcf32c3d40c7327507d1fa0b53f9b5ad0ffbb4b..7ac44380f8ca98efe397dbf4a4a15a524846e92d 100644 (file)
--- a/samples/taskbar/makefile.vc
+++ b/samples/taskbar/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TASKBAR_OBJECTS =  \\r
-       $(OBJS)\taskbar_sample.res \\r
-       $(OBJS)\taskbar_tbtest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\taskbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe\r
-       -if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk\r
-       -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb\r
-\r
-$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TASKBAR_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TASKBAR_OBJECTS =  \
+       $(OBJS)\taskbar_tbtest.obj
+TASKBAR_RESOURCES =  \
+       $(OBJS)\taskbar_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\taskbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
+       -if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk
+       -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb
+
+$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TASKBAR_OBJECTS) $(TASKBAR_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp
+

diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index 187dac2bef5d63c68d0358ebb17f66d43f627806..bcea4f43a501a896955868848d54bad34107ab81 100644 (file)
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TASKBAR_OBJECTS =  &\r
-       $(OBJS)\taskbar_tbtest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\taskbar.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe\r
-\r
-$(OBJS)\taskbar.exe :  $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res\r
-       @%create $(OBJS)\taskbar.lbc\r
-       @%append $(OBJS)\taskbar.lbc option quiet\r
-       @%append $(OBJS)\taskbar.lbc name $^@\r
-       @%append $(OBJS)\taskbar.lbc option caseexact\r
-       @%append $(OBJS)\taskbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taskbar.lbc library %i\r
-       @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res\r
-       @for %i in () do @%append $(OBJS)\taskbar.lbc option stack=%i\r
-       wlink @$(OBJS)\taskbar.lbc\r
-\r
-$(OBJS)\taskbar_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\taskbar_tbtest.obj :  .AUTODEPEND .\tbtest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TASKBAR_OBJECTS =  &
+       $(OBJS)\taskbar_tbtest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\taskbar.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
+
+$(OBJS)\taskbar.exe :  $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res
+       @%create $(OBJS)\taskbar.lbc
+       @%append $(OBJS)\taskbar.lbc option quiet
+       @%append $(OBJS)\taskbar.lbc name $^@
+       @%append $(OBJS)\taskbar.lbc option caseexact
+       @%append $(OBJS)\taskbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taskbar.lbc library %i
+       @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res
+       @for %i in () do @%append $(OBJS)\taskbar.lbc option stack=%i
+       wlink @$(OBJS)\taskbar.lbc
+
+$(OBJS)\taskbar_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\taskbar_tbtest.obj :  .AUTODEPEND .\tbtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $<
+

diff --git a/samples/taskbar/taskbar.dsp b/samples/taskbar/taskbar.dsp
index fd37376df7e9d5ea18fa2a05aa66cf26ec6d170e..21403b8334eac9c7c3bae3be8bc47d215f2047bb 100644 (file)
--- a/samples/taskbar/taskbar.dsp
+++ b/samples/taskbar/taskbar.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\taskbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\taskbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\taskbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\taskbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/taskbar/taskbar_vc7.vcproj b/samples/taskbar/taskbar_vc7.vcproj
index 30e4e242c80a01feaf47eb2b5bd57a3d74ac9f17..1139995b80875264f9ced6a507480135b0f648e5 100644 (file)
--- a/samples/taskbar/taskbar_vc7.vcproj
+++ b/samples/taskbar/taskbar_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\taskbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\taskbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\taskbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\taskbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/taskbar/taskbar_vc8.vcproj b/samples/taskbar/taskbar_vc8.vcproj
index 3d06f4e5023238e1c76243b79b5408d3cd06c916..1cc58f3f5ac364360d84559e49dfaba73b697953 100644 (file)
--- a/samples/taskbar/taskbar_vc8.vcproj
+++ b/samples/taskbar/taskbar_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/taskbar/taskbar_vc9.vcproj b/samples/taskbar/taskbar_vc9.vcproj
index ad66bd4814755553a26e8524144d7869141e195b..e80fcb26455a76daddbc45a38e337e492e7710a8 100644 (file)
--- a/samples/taskbar/taskbar_vc9.vcproj
+++ b/samples/taskbar/taskbar_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\taskbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\taskbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index aba88b2970c12e0dbcc8172c59719d066cee64cc..67019ae10ace825e1cc581d4f35fb21508de6ddc 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc
index 3453443f01ab945b691ef486bdc5ecb577a9f72f..b76b7cdf6c1245a870a1a8105b4765f462c7f13f 100644 (file)
--- a/samples/text/makefile.bcc
+++ b/samples/text/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEXT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TEXT_OBJECTS =  \\r
-       $(OBJS)\text_text.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\text.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
-       -if exist $(OBJS)\text.tds del $(OBJS)\text.tds\r
-       -if exist $(OBJS)\text.ilc del $(OBJS)\text.ilc\r
-       -if exist $(OBJS)\text.ild del $(OBJS)\text.ild\r
-       -if exist $(OBJS)\text.ilf del $(OBJS)\text.ilf\r
-       -if exist $(OBJS)\text.ils del $(OBJS)\text.ils\r
-\r
-$(OBJS)\text.exe: $(TEXT_OBJECTS)  $(OBJS)\text_text.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_text.res\r
-|\r
-\r
-$(OBJS)\text_text.obj: .\text.cpp\r
-       $(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) .\text.cpp\r
-\r
-$(OBJS)\text_text.res: .\text.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\text.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEXT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TEXT_OBJECTS =  \
+       $(OBJS)\text_text.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\text.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe
+       -if exist $(OBJS)\text.tds del $(OBJS)\text.tds
+       -if exist $(OBJS)\text.ilc del $(OBJS)\text.ilc
+       -if exist $(OBJS)\text.ild del $(OBJS)\text.ild
+       -if exist $(OBJS)\text.ilf del $(OBJS)\text.ilf
+       -if exist $(OBJS)\text.ils del $(OBJS)\text.ils
+
+$(OBJS)\text.exe: $(TEXT_OBJECTS)  $(OBJS)\text_text.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_text.res
+|
+
+$(OBJS)\text_text.obj: .\text.cpp
+       $(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) .\text.cpp
+
+$(OBJS)\text_text.res: .\text.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\text.rc
+

diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index dec06d7e6fa4294d40a796849fbd5ee0bb769fd0..687276607280aa5c0b7f887d4b486946c52a4c8a 100644 (file)
--- a/samples/text/makefile.gcc
+++ b/samples/text/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TEXT_OBJECTS =  \\r
-       $(OBJS)\text_text.o \\r
-       $(OBJS)\text_text_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\text.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
-\r
-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text_rc.o\r
-       $(CXX) -o $@ $(TEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\text_text.o: ./text.cpp\r
-       $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\text_text_rc.o: ./text.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
+TEXT_OBJECTS =  \
+       $(OBJS)\text_text.o \
+       $(OBJS)\text_text_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\text.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe
+
+$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text_rc.o
+       $(CXX) -o $@ $(TEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\text_text.o: ./text.cpp
+       $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\text_text_rc.o: ./text.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx
index f37a26c40e8566d65c301e8911d2b4ce573c913c..0c7466622f5d89281baa9e8316e27b9bc9f58d98 100644 (file)
--- a/samples/text/makefile.unx
+++ b/samples/text/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index b514a95a39e45fa44e8bf282a45a4f8bcf74313e..bbc5531127bf832cafdb73378da3d5acf0acacc6 100644 (file)
--- a/samples/text/makefile.vc
+++ b/samples/text/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TEXT_OBJECTS =  \\r
-       $(OBJS)\text_text.obj \\r
-       $(OBJS)\text_text.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\text.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
-       -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk\r
-       -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb\r
-\r
-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TEXT_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\text_text.obj: .\text.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp\r
-\r
-$(OBJS)\text_text.res: .\text.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\text.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TEXT_OBJECTS =  \
+       $(OBJS)\text_text.obj
+TEXT_RESOURCES =  \
+       $(OBJS)\text_text.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\text.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe
+       -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk
+       -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb
+
+$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TEXT_OBJECTS) $(TEXT_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\text_text.obj: .\text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp
+
+$(OBJS)\text_text.res: .\text.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\text.rc
+

diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat
index 850b0ee8b74a2c2946d6fb341717661d8c674f1e..4eda6377722917feb59dd244d1d03ba8cdde3f16 100644 (file)
--- a/samples/text/makefile.wat
+++ b/samples/text/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TEXT_OBJECTS =  &\r
-       $(OBJS)\text_text.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\text.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
-\r
-$(OBJS)\text.exe :  $(TEXT_OBJECTS) $(OBJS)\text_text.res\r
-       @%create $(OBJS)\text.lbc\r
-       @%append $(OBJS)\text.lbc option quiet\r
-       @%append $(OBJS)\text.lbc name $^@\r
-       @%append $(OBJS)\text.lbc option caseexact\r
-       @%append $(OBJS)\text.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\text.lbc library %i\r
-       @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res\r
-       @for %i in () do @%append $(OBJS)\text.lbc option stack=%i\r
-       wlink @$(OBJS)\text.lbc\r
-\r
-$(OBJS)\text_text.obj :  .AUTODEPEND .\text.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $<\r
-\r
-$(OBJS)\text_text.res :  .AUTODEPEND .\text.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TEXT_OBJECTS =  &
+       $(OBJS)\text_text.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\text.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\text.exe del $(OBJS)\text.exe
+
+$(OBJS)\text.exe :  $(TEXT_OBJECTS) $(OBJS)\text_text.res
+       @%create $(OBJS)\text.lbc
+       @%append $(OBJS)\text.lbc option quiet
+       @%append $(OBJS)\text.lbc name $^@
+       @%append $(OBJS)\text.lbc option caseexact
+       @%append $(OBJS)\text.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\text.lbc library %i
+       @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res
+       @for %i in () do @%append $(OBJS)\text.lbc option stack=%i
+       wlink @$(OBJS)\text.lbc
+
+$(OBJS)\text_text.obj :  .AUTODEPEND .\text.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $<
+
+$(OBJS)\text_text.res :  .AUTODEPEND .\text.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/text/text.dsp b/samples/text/text.dsp
index 87a87b56bdec42ca8d11998ae0c82d0d8b1fbe62..a8d35fef6fbcd3c8da46bece6b37307ae7f936cc 100644 (file)
--- a/samples/text/text.dsp
+++ b/samples/text/text.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\text"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\text"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\text"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\text"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/text/text_vc7.vcproj b/samples/text/text_vc7.vcproj
index d5306e26a761e41c3a872e5dd8537295c77e7af2..e05ebeed19d6e7a38844acbebd6e69385d0c64b4 100644 (file)
--- a/samples/text/text_vc7.vcproj
+++ b/samples/text/text_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\text.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\text.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\text.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\text.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/text/text_vc8.vcproj b/samples/text/text_vc8.vcproj
index 159813697ddc6f1fd8a8c3aa29c44ae102763aa1..b2a492bf59c5286ff98f602c9f3c857414a78eeb 100644 (file)
--- a/samples/text/text_vc8.vcproj
+++ b/samples/text/text_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/text/text_vc9.vcproj b/samples/text/text_vc9.vcproj
index 3b011c289e1c3c26d0fa839b99ab2483b29b18d5..7b553405f27f213be26f5fd2ae290bcb407df408 100644 (file)
--- a/samples/text/text_vc9.vcproj
+++ b/samples/text/text_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\text.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\text.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index ca001d3bcccd656ac8c398efda2b8f73aeadb18e..7242c8456e875fda8ac0a1e4a5f3696e1ba22905 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
index eb34ed08594a3ddc2b24aa47c7d13a16cb08012d..3b122738b2c058821615c092a45d5eafc3c0d5ba 100644 (file)
--- a/samples/thread/makefile.bcc
+++ b/samples/thread/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-THREAD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-THREAD_OBJECTS =  \\r
-       $(OBJS)\thread_thread.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\thread.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
-       -if exist $(OBJS)\thread.tds del $(OBJS)\thread.tds\r
-       -if exist $(OBJS)\thread.ilc del $(OBJS)\thread.ilc\r
-       -if exist $(OBJS)\thread.ild del $(OBJS)\thread.ild\r
-       -if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf\r
-       -if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils\r
-\r
-$(OBJS)\thread.exe: $(THREAD_OBJECTS)  $(OBJS)\thread_thread.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_thread.res\r
-|\r
-\r
-$(OBJS)\thread_thread.obj: .\thread.cpp\r
-       $(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
-\r
-$(OBJS)\thread_thread.res: .\thread.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\thread.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+THREAD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+THREAD_OBJECTS =  \
+       $(OBJS)\thread_thread.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\thread.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
+       -if exist $(OBJS)\thread.tds del $(OBJS)\thread.tds
+       -if exist $(OBJS)\thread.ilc del $(OBJS)\thread.ilc
+       -if exist $(OBJS)\thread.ild del $(OBJS)\thread.ild
+       -if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf
+       -if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils
+
+$(OBJS)\thread.exe: $(THREAD_OBJECTS)  $(OBJS)\thread_thread.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_thread.res
+|
+
+$(OBJS)\thread_thread.obj: .\thread.cpp
+       $(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) .\thread.cpp
+
+$(OBJS)\thread_thread.res: .\thread.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\thread.rc
+

diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index 96aa40ab9df104735efba70e0cefd666603ed7f1..e7a8e4e23de3670be9765ef0f0c8a8ed24df61f4 100644 (file)
--- a/samples/thread/makefile.gcc
+++ b/samples/thread/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-THREAD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-THREAD_OBJECTS =  \\r
-       $(OBJS)\thread_thread.o \\r
-       $(OBJS)\thread_thread_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\thread.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
-\r
-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread_rc.o\r
-       $(CXX) -o $@ $(THREAD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\thread_thread.o: ./thread.cpp\r
-       $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\thread_thread_rc.o: ./thread.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+THREAD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+THREAD_OBJECTS =  \
+       $(OBJS)\thread_thread.o \
+       $(OBJS)\thread_thread_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\thread.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
+
+$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread_rc.o
+       $(CXX) -o $@ $(THREAD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\thread_thread.o: ./thread.cpp
+       $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\thread_thread_rc.o: ./thread.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
index 9088e8f51d688b6db3f1b76634848186954f6b55..3c366064fe7569ae7a16e484211a02a61d7986c7 100644 (file)
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index 04994cf8819cd030b72a0dd928cbfe53473163fd..5ef52dc729619c04e95e12eaf059ef483e692297 100644 (file)
--- a/samples/thread/makefile.vc
+++ b/samples/thread/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-THREAD_OBJECTS =  \\r
-       $(OBJS)\thread_thread.obj \\r
-       $(OBJS)\thread_thread.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\thread.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
-       -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk\r
-       -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb\r
-\r
-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(THREAD_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\thread_thread.obj: .\thread.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
-\r
-$(OBJS)\thread_thread.res: .\thread.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\thread.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+THREAD_OBJECTS =  \
+       $(OBJS)\thread_thread.obj
+THREAD_RESOURCES =  \
+       $(OBJS)\thread_thread.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\thread.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
+       -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk
+       -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb
+
+$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(THREAD_OBJECTS) $(THREAD_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\thread_thread.obj: .\thread.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp
+
+$(OBJS)\thread_thread.res: .\thread.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\thread.rc
+

diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index 0ac58b165e0cf44f497bdf912aaa946b30ef87b7..54ba400aa987da19290f3a879f92140520235379 100644 (file)
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-THREAD_OBJECTS =  &\r
-       $(OBJS)\thread_thread.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\thread.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
-\r
-$(OBJS)\thread.exe :  $(THREAD_OBJECTS) $(OBJS)\thread_thread.res\r
-       @%create $(OBJS)\thread.lbc\r
-       @%append $(OBJS)\thread.lbc option quiet\r
-       @%append $(OBJS)\thread.lbc name $^@\r
-       @%append $(OBJS)\thread.lbc option caseexact\r
-       @%append $(OBJS)\thread.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\thread.lbc library %i\r
-       @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res\r
-       @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i\r
-       wlink @$(OBJS)\thread.lbc\r
-\r
-$(OBJS)\thread_thread.obj :  .AUTODEPEND .\thread.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $<\r
-\r
-$(OBJS)\thread_thread.res :  .AUTODEPEND .\thread.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+THREAD_OBJECTS =  &
+       $(OBJS)\thread_thread.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\thread.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
+
+$(OBJS)\thread.exe :  $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
+       @%create $(OBJS)\thread.lbc
+       @%append $(OBJS)\thread.lbc option quiet
+       @%append $(OBJS)\thread.lbc name $^@
+       @%append $(OBJS)\thread.lbc option caseexact
+       @%append $(OBJS)\thread.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\thread.lbc library %i
+       @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res
+       @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i
+       wlink @$(OBJS)\thread.lbc
+
+$(OBJS)\thread_thread.obj :  .AUTODEPEND .\thread.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $<
+
+$(OBJS)\thread_thread.res :  .AUTODEPEND .\thread.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/thread/thread.dsp b/samples/thread/thread.dsp
index e04780ef084f778089ff2783a07636c1d4e58eca..d084d8c66b09d3c68586d5dbaec5eb16f9bc974d 100644 (file)
--- a/samples/thread/thread.dsp
+++ b/samples/thread/thread.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\thread"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\thread"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\thread"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\thread"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/thread/thread_vc7.vcproj b/samples/thread/thread_vc7.vcproj
index 3efb972f556063bf653e3deeef8cb6c5ee2851c4..5884923aed782dcb29bb54bce1d4936936fc2942 100644 (file)
--- a/samples/thread/thread_vc7.vcproj
+++ b/samples/thread/thread_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\thread.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\thread.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\thread.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\thread.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/thread/thread_vc8.vcproj b/samples/thread/thread_vc8.vcproj
index 3510caa0fecce0fba8525f1b37c4c137bb42984d..9c1a831febddcb756f244dfab64761c891ba1d16 100644 (file)
--- a/samples/thread/thread_vc8.vcproj
+++ b/samples/thread/thread_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/thread/thread_vc9.vcproj b/samples/thread/thread_vc9.vcproj
index 33b78524c639aa1c98dae0faf65934b5c8d974fa..742e6aeee7b2708058b5df159355873d6d2f4fd4 100644 (file)
--- a/samples/thread/thread_vc9.vcproj
+++ b/samples/thread/thread_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\thread.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\thread.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index fef356a87a0fa56fab9e9a494612d659f5d09484..7eb2c38e63b06c55dce0cc77f837624035d0f544 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc
index f68218fdeccd8d998732e592a4d6c89a58ed0dfe..1c63b63389d944b33e590bdc55e3d4f6698f1684 100644 (file)
--- a/samples/toolbar/makefile.bcc
+++ b/samples/toolbar/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TOOLBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TOOLBAR_OBJECTS =  \\r
-       $(OBJS)\toolbar_toolbar.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\toolbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe\r
-       -if exist $(OBJS)\toolbar.tds del $(OBJS)\toolbar.tds\r
-       -if exist $(OBJS)\toolbar.ilc del $(OBJS)\toolbar.ilc\r
-       -if exist $(OBJS)\toolbar.ild del $(OBJS)\toolbar.ild\r
-       -if exist $(OBJS)\toolbar.ilf del $(OBJS)\toolbar.ilf\r
-       -if exist $(OBJS)\toolbar.ils del $(OBJS)\toolbar.ils\r
-\r
-$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS)  $(OBJS)\toolbar_toolbar.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TOOLBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\toolbar_toolbar.res\r
-|\r
-\r
-$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp\r
-       $(CXX) -q -c -P -o$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp\r
-\r
-$(OBJS)\toolbar_toolbar.res: .\toolbar.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\toolbar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TOOLBAR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TOOLBAR_OBJECTS =  \
+       $(OBJS)\toolbar_toolbar.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\toolbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe
+       -if exist $(OBJS)\toolbar.tds del $(OBJS)\toolbar.tds
+       -if exist $(OBJS)\toolbar.ilc del $(OBJS)\toolbar.ilc
+       -if exist $(OBJS)\toolbar.ild del $(OBJS)\toolbar.ild
+       -if exist $(OBJS)\toolbar.ilf del $(OBJS)\toolbar.ilf
+       -if exist $(OBJS)\toolbar.ils del $(OBJS)\toolbar.ils
+
+$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS)  $(OBJS)\toolbar_toolbar.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TOOLBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\toolbar_toolbar.res
+|
+
+$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp
+
+$(OBJS)\toolbar_toolbar.res: .\toolbar.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\toolbar.rc
+

diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc
index b54d16a38d41e91df844a0688d26ece409d7c43e..cb5aa79da0589f601a514a771b1ff497999dc692 100644 (file)
--- a/samples/toolbar/makefile.gcc
+++ b/samples/toolbar/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TOOLBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TOOLBAR_OBJECTS =  \\r
-       $(OBJS)\toolbar_toolbar.o \\r
-       $(OBJS)\toolbar_toolbar_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\toolbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe\r
-\r
-$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar_rc.o\r
-       $(CXX) -o $@ $(TOOLBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\toolbar_toolbar.o: ./toolbar.cpp\r
-       $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\toolbar_toolbar_rc.o: ./toolbar.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TOOLBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TOOLBAR_OBJECTS =  \
+       $(OBJS)\toolbar_toolbar.o \
+       $(OBJS)\toolbar_toolbar_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\toolbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe
+
+$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar_rc.o
+       $(CXX) -o $@ $(TOOLBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\toolbar_toolbar.o: ./toolbar.cpp
+       $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\toolbar_toolbar_rc.o: ./toolbar.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
index 3a1db1b36e1ffc38b2488a1c911d0618dbde8e9d..5e8c16ec670fb1380d6e659443479ffc30a41b8d 100644 (file)
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc
index fb15e978f94ab2be57430ad3f645463444720f53..f6e0767f30919a53a70ebab5352069016ae3cfad 100644 (file)
--- a/samples/toolbar/makefile.vc
+++ b/samples/toolbar/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TOOLBAR_OBJECTS =  \\r
-       $(OBJS)\toolbar_toolbar.obj \\r
-       $(OBJS)\toolbar_toolbar.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\toolbar.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe\r
-       -if exist $(OBJS)\toolbar.ilk del $(OBJS)\toolbar.ilk\r
-       -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb\r
-\r
-$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TOOLBAR_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp\r
-\r
-$(OBJS)\toolbar_toolbar.res: .\toolbar.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\toolbar.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TOOLBAR_OBJECTS =  \
+       $(OBJS)\toolbar_toolbar.obj
+TOOLBAR_RESOURCES =  \
+       $(OBJS)\toolbar_toolbar.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\toolbar.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe
+       -if exist $(OBJS)\toolbar.ilk del $(OBJS)\toolbar.ilk
+       -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb
+
+$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TOOLBAR_OBJECTS) $(TOOLBAR_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp
+
+$(OBJS)\toolbar_toolbar.res: .\toolbar.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\toolbar.rc
+

diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat
index 13e374628ca6ff83a0e99644996bb1486e44dfd7..999c986f6d8ba05f38e38fa0d93d5236e37b0005 100644 (file)
--- a/samples/toolbar/makefile.wat
+++ b/samples/toolbar/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TOOLBAR_OBJECTS =  &\r
-       $(OBJS)\toolbar_toolbar.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\toolbar.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe\r
-\r
-$(OBJS)\toolbar.exe :  $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res\r
-       @%create $(OBJS)\toolbar.lbc\r
-       @%append $(OBJS)\toolbar.lbc option quiet\r
-       @%append $(OBJS)\toolbar.lbc name $^@\r
-       @%append $(OBJS)\toolbar.lbc option caseexact\r
-       @%append $(OBJS)\toolbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\toolbar.lbc library %i\r
-       @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res\r
-       @for %i in () do @%append $(OBJS)\toolbar.lbc option stack=%i\r
-       wlink @$(OBJS)\toolbar.lbc\r
-\r
-$(OBJS)\toolbar_toolbar.obj :  .AUTODEPEND .\toolbar.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $<\r
-\r
-$(OBJS)\toolbar_toolbar.res :  .AUTODEPEND .\toolbar.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TOOLBAR_OBJECTS =  &
+       $(OBJS)\toolbar_toolbar.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\toolbar.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe
+
+$(OBJS)\toolbar.exe :  $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res
+       @%create $(OBJS)\toolbar.lbc
+       @%append $(OBJS)\toolbar.lbc option quiet
+       @%append $(OBJS)\toolbar.lbc name $^@
+       @%append $(OBJS)\toolbar.lbc option caseexact
+       @%append $(OBJS)\toolbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\toolbar.lbc library %i
+       @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res
+       @for %i in () do @%append $(OBJS)\toolbar.lbc option stack=%i
+       wlink @$(OBJS)\toolbar.lbc
+
+$(OBJS)\toolbar_toolbar.obj :  .AUTODEPEND .\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $<
+
+$(OBJS)\toolbar_toolbar.res :  .AUTODEPEND .\toolbar.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/toolbar/toolbar.dsp b/samples/toolbar/toolbar.dsp
index 1bb727d3bdf964edd2e210aeb5c152e6fe668f14..5361a871790ae920620be023685f10e5f890a186 100644 (file)
--- a/samples/toolbar/toolbar.dsp
+++ b/samples/toolbar/toolbar.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\toolbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\toolbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\toolbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\toolbar"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/toolbar/toolbar_vc7.vcproj b/samples/toolbar/toolbar_vc7.vcproj
index ea3b13247224405c12aac3bce28be8a80a0856a5..8392de9ba587585f89d681de67663afd67a06daa 100644 (file)
--- a/samples/toolbar/toolbar_vc7.vcproj
+++ b/samples/toolbar/toolbar_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\toolbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\toolbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\toolbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/toolbar/toolbar_vc8.vcproj b/samples/toolbar/toolbar_vc8.vcproj
index ce2445f8a6c1a5651191dcbdd78bc9ae4f9ebe17..3cdf63b31c198b8155b59ac557b8ce6d31368730 100644 (file)
--- a/samples/toolbar/toolbar_vc8.vcproj
+++ b/samples/toolbar/toolbar_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/toolbar/toolbar_vc9.vcproj b/samples/toolbar/toolbar_vc9.vcproj
index ff8db2407a57b13e010525e80633eb6c6ef2c302..e2f7084bb2cc5207f9e5ac50b5102a482af7a264 100644 (file)
--- a/samples/toolbar/toolbar_vc9.vcproj
+++ b/samples/toolbar/toolbar_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\toolbar.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 15086f714e7cee214af0717f40e2d46909df5ec1..80edea3645a257c6595ca8490c1a18cc71d504b8 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
index e49f14be0533d9408f44195247a18d2ec81eee55..3eaa7772855af4ffc8e62c7b9bb47b6f40f9e23f 100644 (file)
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TREECTRL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TREECTRL_OBJECTS =  \\r
-       $(OBJS)\treectrl_treetest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\treectrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe\r
-       -if exist $(OBJS)\treectrl.tds del $(OBJS)\treectrl.tds\r
-       -if exist $(OBJS)\treectrl.ilc del $(OBJS)\treectrl.ilc\r
-       -if exist $(OBJS)\treectrl.ild del $(OBJS)\treectrl.ild\r
-       -if exist $(OBJS)\treectrl.ilf del $(OBJS)\treectrl.ilf\r
-       -if exist $(OBJS)\treectrl.ils del $(OBJS)\treectrl.ils\r
-\r
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS)  $(OBJS)\treectrl_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res\r
-|\r
-\r
-$(OBJS)\treectrl_treetest.obj: .\treetest.cpp\r
-       $(CXX) -q -c -P -o$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp\r
-\r
-$(OBJS)\treectrl_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREECTRL_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TREECTRL_OBJECTS =  \
+       $(OBJS)\treectrl_treetest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treectrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
+       -if exist $(OBJS)\treectrl.tds del $(OBJS)\treectrl.tds
+       -if exist $(OBJS)\treectrl.ilc del $(OBJS)\treectrl.ilc
+       -if exist $(OBJS)\treectrl.ild del $(OBJS)\treectrl.ild
+       -if exist $(OBJS)\treectrl.ilf del $(OBJS)\treectrl.ilf
+       -if exist $(OBJS)\treectrl.ils del $(OBJS)\treectrl.ils
+
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS)  $(OBJS)\treectrl_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res
+|
+
+$(OBJS)\treectrl_treetest.obj: .\treetest.cpp
+       $(CXX) -q -c -P -o$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp
+
+$(OBJS)\treectrl_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc
index 26b7bf337f1b4d651f014dcb9a8032368edaa32b..d0cd8f24c5592186da131c3adb70d6d0c4c713cc 100644 (file)
--- a/samples/treectrl/makefile.gcc
+++ b/samples/treectrl/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TREECTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TREECTRL_OBJECTS =  \\r
-       $(OBJS)\treectrl_treetest.o \\r
-       $(OBJS)\treectrl_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\treectrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe\r
-\r
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample_rc.o\r
-       $(CXX) -o $@ $(TREECTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\treectrl_treetest.o: ./treetest.cpp\r
-       $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\treectrl_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREECTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TREECTRL_OBJECTS =  \
+       $(OBJS)\treectrl_treetest.o \
+       $(OBJS)\treectrl_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treectrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
+
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample_rc.o
+       $(CXX) -o $@ $(TREECTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\treectrl_treetest.o: ./treetest.cpp
+       $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\treectrl_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
index c29092b0f690e9605a5e5438577d84bf1942a365..80642dd506f39ec9e61c0a4f1de0055f7b23d8ce 100644 (file)
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index 61d697b5adb367ddf780ee5e6b917c87a67df4bf..d06fbe066be2bb4fce0e52bccae9ffe5786250cb 100644 (file)
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TREECTRL_OBJECTS =  \\r
-       $(OBJS)\treectrl_treetest.obj \\r
-       $(OBJS)\treectrl_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\treectrl.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe\r
-       -if exist $(OBJS)\treectrl.ilk del $(OBJS)\treectrl.ilk\r
-       -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb\r
-\r
-$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TREECTRL_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\treectrl_treetest.obj: .\treetest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp\r
-\r
-$(OBJS)\treectrl_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TREECTRL_OBJECTS =  \
+       $(OBJS)\treectrl_treetest.obj
+TREECTRL_RESOURCES =  \
+       $(OBJS)\treectrl_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treectrl.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
+       -if exist $(OBJS)\treectrl.ilk del $(OBJS)\treectrl.ilk
+       -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb
+
+$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TREECTRL_OBJECTS) $(TREECTRL_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\treectrl_treetest.obj: .\treetest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp
+
+$(OBJS)\treectrl_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat
index a4a0407a385c4e536644579014623cf485007dab..a74d7e02a6f2b4632ea10500acb3d096f4fb35a3 100644 (file)
--- a/samples/treectrl/makefile.wat
+++ b/samples/treectrl/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TREECTRL_OBJECTS =  &\r
-       $(OBJS)\treectrl_treetest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\treectrl.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe\r
-\r
-$(OBJS)\treectrl.exe :  $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res\r
-       @%create $(OBJS)\treectrl.lbc\r
-       @%append $(OBJS)\treectrl.lbc option quiet\r
-       @%append $(OBJS)\treectrl.lbc name $^@\r
-       @%append $(OBJS)\treectrl.lbc option caseexact\r
-       @%append $(OBJS)\treectrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\treectrl.lbc library %i\r
-       @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res\r
-       @for %i in () do @%append $(OBJS)\treectrl.lbc option stack=%i\r
-       wlink @$(OBJS)\treectrl.lbc\r
-\r
-$(OBJS)\treectrl_treetest.obj :  .AUTODEPEND .\treetest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $<\r
-\r
-$(OBJS)\treectrl_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TREECTRL_OBJECTS =  &
+       $(OBJS)\treectrl_treetest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\treectrl.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
+
+$(OBJS)\treectrl.exe :  $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res
+       @%create $(OBJS)\treectrl.lbc
+       @%append $(OBJS)\treectrl.lbc option quiet
+       @%append $(OBJS)\treectrl.lbc name $^@
+       @%append $(OBJS)\treectrl.lbc option caseexact
+       @%append $(OBJS)\treectrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\treectrl.lbc library %i
+       @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res
+       @for %i in () do @%append $(OBJS)\treectrl.lbc option stack=%i
+       wlink @$(OBJS)\treectrl.lbc
+
+$(OBJS)\treectrl_treetest.obj :  .AUTODEPEND .\treetest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $<
+
+$(OBJS)\treectrl_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/treectrl/treectrl.dsp b/samples/treectrl/treectrl.dsp
index 590a990b15c2d5de3d6565e862fb3cfbb546ba61..e7ffb53a054fe78555cb143bb4db8bf648e41700 100644 (file)
--- a/samples/treectrl/treectrl.dsp
+++ b/samples/treectrl/treectrl.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\treectrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\treectrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\treectrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\treectrl"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/treectrl/treectrl_vc7.vcproj b/samples/treectrl/treectrl_vc7.vcproj
index e20e63b815ffb5ecbe54c7ea7fd55c529378dcb5..919c1d213249e5edeec039e8504ea27f99ac9ba1 100644 (file)
--- a/samples/treectrl/treectrl_vc7.vcproj
+++ b/samples/treectrl/treectrl_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\treectrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\treectrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\treectrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\treectrl.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/treectrl/treectrl_vc8.vcproj b/samples/treectrl/treectrl_vc8.vcproj
index bf4a8a3adeb1082ec5983a73f04f391654332370..c2728a110d6c0b7a233fe404a6507e7bb895ce4f 100644 (file)
--- a/samples/treectrl/treectrl_vc8.vcproj
+++ b/samples/treectrl/treectrl_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/treectrl/treectrl_vc9.vcproj b/samples/treectrl/treectrl_vc9.vcproj
index 46dedf1d3783c798a28dd97d5eaba41e60a00320..5eb8bc089a73ad942889716265791bf759752353 100644 (file)
--- a/samples/treectrl/treectrl_vc9.vcproj
+++ b/samples/treectrl/treectrl_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\treectrl.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\treectrl.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 187f0941ba21f1088b51146a041a1bb5c753bbad..59cc2dceed3c476ada98a783c3d2a5bc05f4581b 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc
index 531daaf2336c7026e6b664258bd1e49c5f4f2abd..b6dee3c31635b84359ffd2505e07c4b1834d8d51 100644 (file)
--- a/samples/typetest/makefile.bcc
+++ b/samples/typetest/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TYPETEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-TYPETEST_OBJECTS =  \\r
-       $(OBJS)\typetest_typetest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\typetest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
-       -if exist $(OBJS)\typetest.tds del $(OBJS)\typetest.tds\r
-       -if exist $(OBJS)\typetest.ilc del $(OBJS)\typetest.ilc\r
-       -if exist $(OBJS)\typetest.ild del $(OBJS)\typetest.ild\r
-       -if exist $(OBJS)\typetest.ilf del $(OBJS)\typetest.ilf\r
-       -if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils\r
-\r
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS)  $(OBJS)\typetest_typetest.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_typetest.res\r
-|\r
-\r
-$(OBJS)\typetest_typetest.obj: .\typetest.cpp\r
-       $(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
-\r
-$(OBJS)\typetest_typetest.res: .\typetest.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\typetest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TYPETEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TYPETEST_OBJECTS =  \
+       $(OBJS)\typetest_typetest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\typetest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
+       -if exist $(OBJS)\typetest.tds del $(OBJS)\typetest.tds
+       -if exist $(OBJS)\typetest.ilc del $(OBJS)\typetest.ilc
+       -if exist $(OBJS)\typetest.ild del $(OBJS)\typetest.ild
+       -if exist $(OBJS)\typetest.ilf del $(OBJS)\typetest.ilf
+       -if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils
+
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS)  $(OBJS)\typetest_typetest.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_typetest.res
+|
+
+$(OBJS)\typetest_typetest.obj: .\typetest.cpp
+       $(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp
+
+$(OBJS)\typetest_typetest.res: .\typetest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\typetest.rc
+

diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 8548eb4e063f40e9b38a71ca6c6ad8c254e7e42c..151776df7e9b18b49fb639822e9cbeace374d0eb 100644 (file)
--- a/samples/typetest/makefile.gcc
+++ b/samples/typetest/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TYPETEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-TYPETEST_OBJECTS =  \\r
-       $(OBJS)\typetest_typetest.o \\r
-       $(OBJS)\typetest_typetest_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\typetest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
-\r
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o\r
-       $(CXX) -o $@ $(TYPETEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\typetest_typetest.o: ./typetest.cpp\r
-       $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\typetest_typetest_rc.o: ./typetest.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TYPETEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TYPETEST_OBJECTS =  \
+       $(OBJS)\typetest_typetest.o \
+       $(OBJS)\typetest_typetest_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\typetest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
+
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o
+       $(CXX) -o $@ $(TYPETEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\typetest_typetest.o: ./typetest.cpp
+       $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\typetest_typetest_rc.o: ./typetest.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx
index ec28ad2d5e94f37a23f69d87263c940624565170..2f315b7ae0a87054b4d5a399870f348b614753f2 100644 (file)
--- a/samples/typetest/makefile.unx
+++ b/samples/typetest/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index f351675ac4d937e1a2bd0217c96f0094e27cac6f..704fa9348f1ee0cfce9b4dd4002e0f5658dc5370 100644 (file)
--- a/samples/typetest/makefile.vc
+++ b/samples/typetest/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-TYPETEST_OBJECTS =  \\r
-       $(OBJS)\typetest_typetest.obj \\r
-       $(OBJS)\typetest_typetest.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\typetest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
-       -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk\r
-       -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb\r
-\r
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(TYPETEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\typetest_typetest.obj: .\typetest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
-\r
-$(OBJS)\typetest_typetest.res: .\typetest.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\typetest.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+TYPETEST_OBJECTS =  \
+       $(OBJS)\typetest_typetest.obj
+TYPETEST_RESOURCES =  \
+       $(OBJS)\typetest_typetest.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\typetest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
+       -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk
+       -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb
+
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(TYPETEST_OBJECTS) $(TYPETEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\typetest_typetest.obj: .\typetest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp
+
+$(OBJS)\typetest_typetest.res: .\typetest.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\typetest.rc
+

diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat
index a6ffaedbcdd54b619cf46b3b9fd6f9cc5c56fe23..02b7799ce722956f3e223d3853bb2b5d6952366d 100644 (file)
--- a/samples/typetest/makefile.wat
+++ b/samples/typetest/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-TYPETEST_OBJECTS =  &\r
-       $(OBJS)\typetest_typetest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\typetest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
-\r
-$(OBJS)\typetest.exe :  $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res\r
-       @%create $(OBJS)\typetest.lbc\r
-       @%append $(OBJS)\typetest.lbc option quiet\r
-       @%append $(OBJS)\typetest.lbc name $^@\r
-       @%append $(OBJS)\typetest.lbc option caseexact\r
-       @%append $(OBJS)\typetest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\typetest.lbc library %i\r
-       @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res\r
-       @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i\r
-       wlink @$(OBJS)\typetest.lbc\r
-\r
-$(OBJS)\typetest_typetest.obj :  .AUTODEPEND .\typetest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $<\r
-\r
-$(OBJS)\typetest_typetest.res :  .AUTODEPEND .\typetest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+TYPETEST_OBJECTS =  &
+       $(OBJS)\typetest_typetest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\typetest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
+
+$(OBJS)\typetest.exe :  $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
+       @%create $(OBJS)\typetest.lbc
+       @%append $(OBJS)\typetest.lbc option quiet
+       @%append $(OBJS)\typetest.lbc name $^@
+       @%append $(OBJS)\typetest.lbc option caseexact
+       @%append $(OBJS)\typetest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\typetest.lbc library %i
+       @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res
+       @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i
+       wlink @$(OBJS)\typetest.lbc
+
+$(OBJS)\typetest_typetest.obj :  .AUTODEPEND .\typetest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $<
+
+$(OBJS)\typetest_typetest.res :  .AUTODEPEND .\typetest.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp
index ae0aa70fe9684e79b67cd73557e4ee7d7a38886b..cf265712f3a35dc302bb85466e60a7f869998986 100644 (file)
--- a/samples/typetest/typetest.dsp
+++ b/samples/typetest/typetest.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\typetest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\typetest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\typetest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\typetest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj
index 32be8f2d8d24e9c885cd8c9681e5be7da67bd761..0409b3a8da6837488b039889fd092ec99d9babb8 100644 (file)
--- a/samples/typetest/typetest_vc7.vcproj
+++ b/samples/typetest/typetest_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\typetest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\typetest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\typetest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\typetest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj
index aca9f6b051c8950e958eb7b70cc3945b3e43b5b9..2f6b99cdc04f2bbd67c0d1b43e93f711f9aba152 100644 (file)
--- a/samples/typetest/typetest_vc8.vcproj
+++ b/samples/typetest/typetest_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj
index b4c78cb67f2cac8357d7cd24e6989533242fa817..5bdf1e2d4e17a4b081fb4c427feb504ae40d1078 100644 (file)
--- a/samples/typetest/typetest_vc9.vcproj
+++ b/samples/typetest/typetest_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\typetest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\typetest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index ae54147d7824f9f115da6be3bdf9c4db5b9b038a..3f59b563841523a9d041336c9d7cb2366c9e5666 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc
index 5882f7a55fbb77913d52eb75440df52f1d26ce99..3313f8bdef27f11691622b6a8642709d043621a1 100644 (file)
--- a/samples/validate/makefile.bcc
+++ b/samples/validate/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VALIDATE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-VALIDATE_OBJECTS =  \\r
-       $(OBJS)\validate_validate.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\validate.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe\r
-       -if exist $(OBJS)\validate.tds del $(OBJS)\validate.tds\r
-       -if exist $(OBJS)\validate.ilc del $(OBJS)\validate.ilc\r
-       -if exist $(OBJS)\validate.ild del $(OBJS)\validate.ild\r
-       -if exist $(OBJS)\validate.ilf del $(OBJS)\validate.ilf\r
-       -if exist $(OBJS)\validate.ils del $(OBJS)\validate.ils\r
-\r
-$(OBJS)\validate.exe: $(VALIDATE_OBJECTS)  $(OBJS)\validate_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res\r
-|\r
-\r
-$(OBJS)\validate_validate.obj: .\validate.cpp\r
-       $(CXX) -q -c -P -o$@ $(VALIDATE_CXXFLAGS) .\validate.cpp\r
-\r
-$(OBJS)\validate_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VALIDATE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+VALIDATE_OBJECTS =  \
+       $(OBJS)\validate_validate.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\validate.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe
+       -if exist $(OBJS)\validate.tds del $(OBJS)\validate.tds
+       -if exist $(OBJS)\validate.ilc del $(OBJS)\validate.ilc
+       -if exist $(OBJS)\validate.ild del $(OBJS)\validate.ild
+       -if exist $(OBJS)\validate.ilf del $(OBJS)\validate.ilf
+       -if exist $(OBJS)\validate.ils del $(OBJS)\validate.ils
+
+$(OBJS)\validate.exe: $(VALIDATE_OBJECTS)  $(OBJS)\validate_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res
+|
+
+$(OBJS)\validate_validate.obj: .\validate.cpp
+       $(CXX) -q -c -P -o$@ $(VALIDATE_CXXFLAGS) .\validate.cpp
+
+$(OBJS)\validate_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc
index 25c4d8378b5d59c51494a82e5af561229bb91d16..fb5a710f95bd770d22ab19cdebb84c77e21a3871 100644 (file)
--- a/samples/validate/makefile.gcc
+++ b/samples/validate/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VALIDATE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-VALIDATE_OBJECTS =  \\r
-       $(OBJS)\validate_validate.o \\r
-       $(OBJS)\validate_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\validate.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe\r
-\r
-$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample_rc.o\r
-       $(CXX) -o $@ $(VALIDATE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\validate_validate.o: ./validate.cpp\r
-       $(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\validate_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VALIDATE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+VALIDATE_OBJECTS =  \
+       $(OBJS)\validate_validate.o \
+       $(OBJS)\validate_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\validate.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe
+
+$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample_rc.o
+       $(CXX) -o $@ $(VALIDATE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\validate_validate.o: ./validate.cpp
+       $(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\validate_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx
index e8fa6a46474488f4ca5ad5ea24b1f0da9bca334a..62853f6ed2831566c52af67ef6bad26d272c0248 100644 (file)
--- a/samples/validate/makefile.unx
+++ b/samples/validate/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc
index e53c8eea03658955f82cff02988a47fb6f376ec0..d672f20e661049084e634bb338aa4c1263a1a5b9 100644 (file)
--- a/samples/validate/makefile.vc
+++ b/samples/validate/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-VALIDATE_OBJECTS =  \\r
-       $(OBJS)\validate_validate.obj \\r
-       $(OBJS)\validate_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\validate.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe\r
-       -if exist $(OBJS)\validate.ilk del $(OBJS)\validate.ilk\r
-       -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb\r
-\r
-$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(VALIDATE_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\validate_validate.obj: .\validate.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(VALIDATE_CXXFLAGS) .\validate.cpp\r
-\r
-$(OBJS)\validate_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+VALIDATE_OBJECTS =  \
+       $(OBJS)\validate_validate.obj
+VALIDATE_RESOURCES =  \
+       $(OBJS)\validate_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\validate.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe
+       -if exist $(OBJS)\validate.ilk del $(OBJS)\validate.ilk
+       -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb
+
+$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(VALIDATE_OBJECTS) $(VALIDATE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\validate_validate.obj: .\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(VALIDATE_CXXFLAGS) .\validate.cpp
+
+$(OBJS)\validate_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat
index aad1a247e954c5c1c7c1ba1a87a98c8abdef034d..16da6126e993f4091225986bb480f205820a9830 100644 (file)
--- a/samples/validate/makefile.wat
+++ b/samples/validate/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-VALIDATE_OBJECTS =  &\r
-       $(OBJS)\validate_validate.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\validate.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe\r
-\r
-$(OBJS)\validate.exe :  $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res\r
-       @%create $(OBJS)\validate.lbc\r
-       @%append $(OBJS)\validate.lbc option quiet\r
-       @%append $(OBJS)\validate.lbc name $^@\r
-       @%append $(OBJS)\validate.lbc option caseexact\r
-       @%append $(OBJS)\validate.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\validate.lbc library %i\r
-       @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res\r
-       @for %i in () do @%append $(OBJS)\validate.lbc option stack=%i\r
-       wlink @$(OBJS)\validate.lbc\r
-\r
-$(OBJS)\validate_validate.obj :  .AUTODEPEND .\validate.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $<\r
-\r
-$(OBJS)\validate_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+VALIDATE_OBJECTS =  &
+       $(OBJS)\validate_validate.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\validate.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe
+
+$(OBJS)\validate.exe :  $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res
+       @%create $(OBJS)\validate.lbc
+       @%append $(OBJS)\validate.lbc option quiet
+       @%append $(OBJS)\validate.lbc name $^@
+       @%append $(OBJS)\validate.lbc option caseexact
+       @%append $(OBJS)\validate.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\validate.lbc library %i
+       @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res
+       @for %i in () do @%append $(OBJS)\validate.lbc option stack=%i
+       wlink @$(OBJS)\validate.lbc
+
+$(OBJS)\validate_validate.obj :  .AUTODEPEND .\validate.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $<
+
+$(OBJS)\validate_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/validate/validate.dsp b/samples/validate/validate.dsp
index 0c0ca5a8e3ad7c3b24f4960c4fbc391d0de4edc8..d98e1fde646b53184369e7cbd9a4d145ff13da64 100644 (file)
--- a/samples/validate/validate.dsp
+++ b/samples/validate/validate.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\validate"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\validate"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\validate"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\validate"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/validate/validate_vc7.vcproj b/samples/validate/validate_vc7.vcproj
index dae84c12cbde7e914d73ebc8b9258d683d8e4fcc..96aaaa1fde94445de30283bf329afafe029c3596 100644 (file)
--- a/samples/validate/validate_vc7.vcproj
+++ b/samples/validate/validate_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\validate.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\validate.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\validate.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\validate.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/validate/validate_vc8.vcproj b/samples/validate/validate_vc8.vcproj
index 6ea386caedb2cff8ee989871f5bfaad4d0a90e72..1a16730d69041d6d6ec2cdc5ad084b36b77a8fc8 100644 (file)
--- a/samples/validate/validate_vc8.vcproj
+++ b/samples/validate/validate_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/validate/validate_vc9.vcproj b/samples/validate/validate_vc9.vcproj
index 6324f5dc89e96dd2778694b74dc9215c02ffccb7..3ba416f3dc5cd4610505f245c2910aecaed3ea6d 100644 (file)
--- a/samples/validate/validate_vc9.vcproj
+++ b/samples/validate/validate_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\validate.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\validate.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 80cd31ba749ee63c3cf6cfa220c04e5a2eee6436..4ff4e87f16a8398d5df04256c8a9d9759a9f965e 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc
index e4dc26f0d5db6257119a121502834aed861a133d..a6026f1175c8db5460e80d9d9f39b81c104cf8f1 100644 (file)
--- a/samples/vscroll/makefile.bcc
+++ b/samples/vscroll/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-VSTEST_OBJECTS =  \\r
-       $(OBJS)\vstest_vstest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\vstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe\r
-       -if exist $(OBJS)\vstest.tds del $(OBJS)\vstest.tds\r
-       -if exist $(OBJS)\vstest.ilc del $(OBJS)\vstest.ilc\r
-       -if exist $(OBJS)\vstest.ild del $(OBJS)\vstest.ild\r
-       -if exist $(OBJS)\vstest.ilf del $(OBJS)\vstest.ilf\r
-       -if exist $(OBJS)\vstest.ils del $(OBJS)\vstest.ils\r
-\r
-$(OBJS)\vstest.exe: $(VSTEST_OBJECTS)  $(OBJS)\vstest_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(VSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\vstest_sample.res\r
-|\r
-\r
-$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\vstest_vstest.obj: .\vstest.cpp\r
-       $(CXX) -q -c -P -o$@ $(VSTEST_CXXFLAGS) .\vstest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VSTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+VSTEST_OBJECTS =  \
+       $(OBJS)\vstest_vstest.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\vstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
+       -if exist $(OBJS)\vstest.tds del $(OBJS)\vstest.tds
+       -if exist $(OBJS)\vstest.ilc del $(OBJS)\vstest.ilc
+       -if exist $(OBJS)\vstest.ild del $(OBJS)\vstest.ild
+       -if exist $(OBJS)\vstest.ilf del $(OBJS)\vstest.ilf
+       -if exist $(OBJS)\vstest.ils del $(OBJS)\vstest.ils
+
+$(OBJS)\vstest.exe: $(VSTEST_OBJECTS)  $(OBJS)\vstest_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(VSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\vstest_sample.res
+|
+
+$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\vstest_vstest.obj: .\vstest.cpp
+       $(CXX) -q -c -P -o$@ $(VSTEST_CXXFLAGS) .\vstest.cpp
+

diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc
index d0f046b43798fdff0fa740c4ce6ab7c9704fb129..7ce0114ffec97ae93afc28d805b76c3f1b538289 100644 (file)
--- a/samples/vscroll/makefile.gcc
+++ b/samples/vscroll/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-VSTEST_OBJECTS =  \\r
-       $(OBJS)\vstest_sample_rc.o \\r
-       $(OBJS)\vstest_vstest.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\vstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe\r
-\r
-$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample_rc.o\r
-       $(CXX) -o $@ $(VSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\vstest_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\vstest_vstest.o: ./vstest.cpp\r
-       $(CXX) -c -o $@ $(VSTEST_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+VSTEST_OBJECTS =  \
+       $(OBJS)\vstest_sample_rc.o \
+       $(OBJS)\vstest_vstest.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\vstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
+
+$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample_rc.o
+       $(CXX) -o $@ $(VSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\vstest_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\vstest_vstest.o: ./vstest.cpp
+       $(CXX) -c -o $@ $(VSTEST_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx
index 4420404264b0159c598d6dcde3577718af6cb41e..e86ab9aa9e5dd6dc82aea3bd77a39f86dcc92d45 100644 (file)
--- a/samples/vscroll/makefile.unx
+++ b/samples/vscroll/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc
index 02033fc32fb84ea43853b3d97bca4921c29f994b..cc3b6598e49d639f88f7e33cdce84579cf8fdfae 100644 (file)
--- a/samples/vscroll/makefile.vc
+++ b/samples/vscroll/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-VSTEST_OBJECTS =  \\r
-       $(OBJS)\vstest_sample.res \\r
-       $(OBJS)\vstest_vstest.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\vstest.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe\r
-       -if exist $(OBJS)\vstest.ilk del $(OBJS)\vstest.ilk\r
-       -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb\r
-\r
-$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(VSTEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\vstest_vstest.obj: .\vstest.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(VSTEST_CXXFLAGS) .\vstest.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+VSTEST_OBJECTS =  \
+       $(OBJS)\vstest_vstest.obj
+VSTEST_RESOURCES =  \
+       $(OBJS)\vstest_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\vstest.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
+       -if exist $(OBJS)\vstest.ilk del $(OBJS)\vstest.ilk
+       -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb
+
+$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(VSTEST_OBJECTS) $(VSTEST_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\vstest_vstest.obj: .\vstest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(VSTEST_CXXFLAGS) .\vstest.cpp
+

diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat
index 9a92a348bed6e2ae9730666817bf2745fe3b409d..3d4fbeee9f9a84f6ed488db90448d120bea131fb 100644 (file)
--- a/samples/vscroll/makefile.wat
+++ b/samples/vscroll/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-VSTEST_OBJECTS =  &\r
-       $(OBJS)\vstest_vstest.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\vstest.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe\r
-\r
-$(OBJS)\vstest.exe :  $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res\r
-       @%create $(OBJS)\vstest.lbc\r
-       @%append $(OBJS)\vstest.lbc option quiet\r
-       @%append $(OBJS)\vstest.lbc name $^@\r
-       @%append $(OBJS)\vstest.lbc option caseexact\r
-       @%append $(OBJS)\vstest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\vstest.lbc library %i\r
-       @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res\r
-       @for %i in () do @%append $(OBJS)\vstest.lbc option stack=%i\r
-       wlink @$(OBJS)\vstest.lbc\r
-\r
-$(OBJS)\vstest_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\vstest_vstest.obj :  .AUTODEPEND .\vstest.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(VSTEST_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+VSTEST_OBJECTS =  &
+       $(OBJS)\vstest_vstest.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\vstest.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
+
+$(OBJS)\vstest.exe :  $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res
+       @%create $(OBJS)\vstest.lbc
+       @%append $(OBJS)\vstest.lbc option quiet
+       @%append $(OBJS)\vstest.lbc name $^@
+       @%append $(OBJS)\vstest.lbc option caseexact
+       @%append $(OBJS)\vstest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\vstest.lbc library %i
+       @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res
+       @for %i in () do @%append $(OBJS)\vstest.lbc option stack=%i
+       wlink @$(OBJS)\vstest.lbc
+
+$(OBJS)\vstest_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\vstest_vstest.obj :  .AUTODEPEND .\vstest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(VSTEST_CXXFLAGS) $<
+

diff --git a/samples/vscroll/vscroll.dsp b/samples/vscroll/vscroll.dsp
index be9b57671425f87eef95c501e583929db75c8701..5ffa94a5ff3d393f78edbcc00445301e65bb5ee2 100644 (file)
--- a/samples/vscroll/vscroll.dsp
+++ b/samples/vscroll/vscroll.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\vstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\vstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\vstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\vstest"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/vscroll/vscroll_vc7.vcproj b/samples/vscroll/vscroll_vc7.vcproj
index 198986f5fbdeb6cb46465c42519e4317a859cd75..afb2dd2762d4e730e519154437a78c40792a6119 100644 (file)
--- a/samples/vscroll/vscroll_vc7.vcproj
+++ b/samples/vscroll/vscroll_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\vstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\vstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\vstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\vstest.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/vscroll/vscroll_vc8.vcproj b/samples/vscroll/vscroll_vc8.vcproj
index 831d8f6b326ad0f1136650ed57846b34d595f784..62ecd7cd3409d322b05a86f2d2e7abcfcf292561 100644 (file)
--- a/samples/vscroll/vscroll_vc8.vcproj
+++ b/samples/vscroll/vscroll_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/vscroll/vscroll_vc9.vcproj b/samples/vscroll/vscroll_vc9.vcproj
index e2114cabfecd18b519ee2b5ebd5014d49a001d5f..b5b6ed97d658ae256efcf8f391cf0e04939bdf3f 100644 (file)
--- a/samples/vscroll/vscroll_vc9.vcproj
+++ b/samples/vscroll/vscroll_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\vstest.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\vstest.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index fc822f1e7167f428fd037263a6d2faf8f971c1d5..24b312c9549bf1b0386e1610820709c848b3ece4 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index 67f7799cc78600c7a3e7d1e9da4819c77424d6f9..90e3308a1ed672e845517836f2f4c8a684c728d8 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -1,344 +1,344 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGETS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGETS_OBJECTS =  \\r
-       $(OBJS)\widgets_bmpcombobox.obj \\r
-       $(OBJS)\widgets_button.obj \\r
-       $(OBJS)\widgets_checkbox.obj \\r
-       $(OBJS)\widgets_choice.obj \\r
-       $(OBJS)\widgets_clrpicker.obj \\r
-       $(OBJS)\widgets_combobox.obj \\r
-       $(OBJS)\widgets_datepick.obj \\r
-       $(OBJS)\widgets_dirctrl.obj \\r
-       $(OBJS)\widgets_dirpicker.obj \\r
-       $(OBJS)\widgets_editlbox.obj \\r
-       $(OBJS)\widgets_filectrl.obj \\r
-       $(OBJS)\widgets_filepicker.obj \\r
-       $(OBJS)\widgets_fontpicker.obj \\r
-       $(OBJS)\widgets_gauge.obj \\r
-       $(OBJS)\widgets_hyperlnk.obj \\r
-       $(OBJS)\widgets_itemcontainer.obj \\r
-       $(OBJS)\widgets_listbox.obj \\r
-       $(OBJS)\widgets_notebook.obj \\r
-       $(OBJS)\widgets_odcombobox.obj \\r
-       $(OBJS)\widgets_radiobox.obj \\r
-       $(OBJS)\widgets_searchctrl.obj \\r
-       $(OBJS)\widgets_slider.obj \\r
-       $(OBJS)\widgets_spinbtn.obj \\r
-       $(OBJS)\widgets_static.obj \\r
-       $(OBJS)\widgets_statbmp.obj \\r
-       $(OBJS)\widgets_textctrl.obj \\r
-       $(OBJS)\widgets_toggle.obj \\r
-       $(OBJS)\widgets_widgets.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widgets.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe\r
-       -if exist $(OBJS)\widgets.tds del $(OBJS)\widgets.tds\r
-       -if exist $(OBJS)\widgets.ilc del $(OBJS)\widgets.ilc\r
-       -if exist $(OBJS)\widgets.ild del $(OBJS)\widgets.ild\r
-       -if exist $(OBJS)\widgets.ilf del $(OBJS)\widgets.ilf\r
-       -if exist $(OBJS)\widgets.ils del $(OBJS)\widgets.ils\r
-\r
-$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS)  $(OBJS)\widgets_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res\r
-|\r
-\r
-$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp\r
-\r
-$(OBJS)\widgets_button.obj: .\button.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\button.cpp\r
-\r
-$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp\r
-\r
-$(OBJS)\widgets_choice.obj: .\choice.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\choice.cpp\r
-\r
-$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp\r
-\r
-$(OBJS)\widgets_combobox.obj: .\combobox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp\r
-\r
-$(OBJS)\widgets_datepick.obj: .\datepick.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp\r
-\r
-$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp\r
-\r
-$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp\r
-\r
-$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp\r
-\r
-$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp\r
-\r
-$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp\r
-\r
-$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp\r
-\r
-$(OBJS)\widgets_gauge.obj: .\gauge.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp\r
-\r
-$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp\r
-\r
-$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp\r
-\r
-$(OBJS)\widgets_listbox.obj: .\listbox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp\r
-\r
-$(OBJS)\widgets_notebook.obj: .\notebook.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp\r
-\r
-$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp\r
-\r
-$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp\r
-\r
-$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp\r
-\r
-$(OBJS)\widgets_slider.obj: .\slider.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\slider.cpp\r
-\r
-$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp\r
-\r
-$(OBJS)\widgets_static.obj: .\static.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\static.cpp\r
-\r
-$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp\r
-\r
-$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp\r
-\r
-$(OBJS)\widgets_toggle.obj: .\toggle.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp\r
-\r
-$(OBJS)\widgets_widgets.obj: .\widgets.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp\r
-\r
-$(OBJS)\widgets_sample.res: .\..\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGETS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.obj \
+       $(OBJS)\widgets_button.obj \
+       $(OBJS)\widgets_checkbox.obj \
+       $(OBJS)\widgets_choice.obj \
+       $(OBJS)\widgets_clrpicker.obj \
+       $(OBJS)\widgets_combobox.obj \
+       $(OBJS)\widgets_datepick.obj \
+       $(OBJS)\widgets_dirctrl.obj \
+       $(OBJS)\widgets_dirpicker.obj \
+       $(OBJS)\widgets_editlbox.obj \
+       $(OBJS)\widgets_filectrl.obj \
+       $(OBJS)\widgets_filepicker.obj \
+       $(OBJS)\widgets_fontpicker.obj \
+       $(OBJS)\widgets_gauge.obj \
+       $(OBJS)\widgets_hyperlnk.obj \
+       $(OBJS)\widgets_itemcontainer.obj \
+       $(OBJS)\widgets_listbox.obj \
+       $(OBJS)\widgets_notebook.obj \
+       $(OBJS)\widgets_odcombobox.obj \
+       $(OBJS)\widgets_radiobox.obj \
+       $(OBJS)\widgets_searchctrl.obj \
+       $(OBJS)\widgets_slider.obj \
+       $(OBJS)\widgets_spinbtn.obj \
+       $(OBJS)\widgets_static.obj \
+       $(OBJS)\widgets_statbmp.obj \
+       $(OBJS)\widgets_textctrl.obj \
+       $(OBJS)\widgets_toggle.obj \
+       $(OBJS)\widgets_widgets.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widgets.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+       -if exist $(OBJS)\widgets.tds del $(OBJS)\widgets.tds
+       -if exist $(OBJS)\widgets.ilc del $(OBJS)\widgets.ilc
+       -if exist $(OBJS)\widgets.ild del $(OBJS)\widgets.ild
+       -if exist $(OBJS)\widgets.ilf del $(OBJS)\widgets.ilf
+       -if exist $(OBJS)\widgets.ils del $(OBJS)\widgets.ils
+
+$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS)  $(OBJS)\widgets_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res
+|
+
+$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp
+
+$(OBJS)\widgets_button.obj: .\button.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\button.cpp
+
+$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp
+
+$(OBJS)\widgets_choice.obj: .\choice.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\choice.cpp
+
+$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp
+
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp
+
+$(OBJS)\widgets_datepick.obj: .\datepick.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp
+
+$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp
+
+$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp
+
+$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp
+
+$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp
+
+$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp
+
+$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp
+
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp
+
+$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp
+
+$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp
+
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp
+
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp
+
+$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp
+
+$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp
+
+$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp
+
+$(OBJS)\widgets_slider.obj: .\slider.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\slider.cpp
+
+$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp
+
+$(OBJS)\widgets_static.obj: .\static.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\static.cpp
+
+$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp
+
+$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp
+
+$(OBJS)\widgets_toggle.obj: .\toggle.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp
+
+$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp
+
+$(OBJS)\widgets_sample.res: .\..\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
+

diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index ed1740c6f1fa916ed5fe06fc0cba494cc86c8bfd..bde6c4a5c9d12c987eb7c0d91d70c8b858cea7e3 100644 (file)
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -1,338 +1,338 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGETS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGETS_OBJECTS =  \\r
-       $(OBJS)\widgets_bmpcombobox.o \\r
-       $(OBJS)\widgets_button.o \\r
-       $(OBJS)\widgets_checkbox.o \\r
-       $(OBJS)\widgets_choice.o \\r
-       $(OBJS)\widgets_clrpicker.o \\r
-       $(OBJS)\widgets_combobox.o \\r
-       $(OBJS)\widgets_datepick.o \\r
-       $(OBJS)\widgets_dirctrl.o \\r
-       $(OBJS)\widgets_dirpicker.o \\r
-       $(OBJS)\widgets_editlbox.o \\r
-       $(OBJS)\widgets_filectrl.o \\r
-       $(OBJS)\widgets_filepicker.o \\r
-       $(OBJS)\widgets_fontpicker.o \\r
-       $(OBJS)\widgets_gauge.o \\r
-       $(OBJS)\widgets_hyperlnk.o \\r
-       $(OBJS)\widgets_itemcontainer.o \\r
-       $(OBJS)\widgets_listbox.o \\r
-       $(OBJS)\widgets_notebook.o \\r
-       $(OBJS)\widgets_odcombobox.o \\r
-       $(OBJS)\widgets_radiobox.o \\r
-       $(OBJS)\widgets_searchctrl.o \\r
-       $(OBJS)\widgets_slider.o \\r
-       $(OBJS)\widgets_spinbtn.o \\r
-       $(OBJS)\widgets_static.o \\r
-       $(OBJS)\widgets_statbmp.o \\r
-       $(OBJS)\widgets_textctrl.o \\r
-       $(OBJS)\widgets_toggle.o \\r
-       $(OBJS)\widgets_widgets.o \\r
-       $(OBJS)\widgets_sample_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widgets.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe\r
-\r
-$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample_rc.o\r
-       $(CXX) -o $@ $(WIDGETS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\widgets_bmpcombobox.o: ./bmpcombobox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_button.o: ./button.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_checkbox.o: ./checkbox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_choice.o: ./choice.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_clrpicker.o: ./clrpicker.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_combobox.o: ./combobox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_datepick.o: ./datepick.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_dirctrl.o: ./dirctrl.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_dirpicker.o: ./dirpicker.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_editlbox.o: ./editlbox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_filectrl.o: ./filectrl.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_filepicker.o: ./filepicker.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_fontpicker.o: ./fontpicker.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_gauge.o: ./gauge.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_hyperlnk.o: ./hyperlnk.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_itemcontainer.o: ./itemcontainer.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_listbox.o: ./listbox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_notebook.o: ./notebook.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_odcombobox.o: ./odcombobox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_radiobox.o: ./radiobox.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_searchctrl.o: ./searchctrl.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_slider.o: ./slider.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_spinbtn.o: ./spinbtn.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_static.o: ./static.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_statbmp.o: ./statbmp.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_textctrl.o: ./textctrl.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_toggle.o: ./toggle.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_widgets.o: ./widgets.cpp\r
-       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\widgets_sample_rc.o: ./../sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGETS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.o \
+       $(OBJS)\widgets_button.o \
+       $(OBJS)\widgets_checkbox.o \
+       $(OBJS)\widgets_choice.o \
+       $(OBJS)\widgets_clrpicker.o \
+       $(OBJS)\widgets_combobox.o \
+       $(OBJS)\widgets_datepick.o \
+       $(OBJS)\widgets_dirctrl.o \
+       $(OBJS)\widgets_dirpicker.o \
+       $(OBJS)\widgets_editlbox.o \
+       $(OBJS)\widgets_filectrl.o \
+       $(OBJS)\widgets_filepicker.o \
+       $(OBJS)\widgets_fontpicker.o \
+       $(OBJS)\widgets_gauge.o \
+       $(OBJS)\widgets_hyperlnk.o \
+       $(OBJS)\widgets_itemcontainer.o \
+       $(OBJS)\widgets_listbox.o \
+       $(OBJS)\widgets_notebook.o \
+       $(OBJS)\widgets_odcombobox.o \
+       $(OBJS)\widgets_radiobox.o \
+       $(OBJS)\widgets_searchctrl.o \
+       $(OBJS)\widgets_slider.o \
+       $(OBJS)\widgets_spinbtn.o \
+       $(OBJS)\widgets_static.o \
+       $(OBJS)\widgets_statbmp.o \
+       $(OBJS)\widgets_textctrl.o \
+       $(OBJS)\widgets_toggle.o \
+       $(OBJS)\widgets_widgets.o \
+       $(OBJS)\widgets_sample_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widgets.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+
+$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample_rc.o
+       $(CXX) -o $@ $(WIDGETS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\widgets_bmpcombobox.o: ./bmpcombobox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_button.o: ./button.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_checkbox.o: ./checkbox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_choice.o: ./choice.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_clrpicker.o: ./clrpicker.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_combobox.o: ./combobox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_datepick.o: ./datepick.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_dirctrl.o: ./dirctrl.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_dirpicker.o: ./dirpicker.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_editlbox.o: ./editlbox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_filectrl.o: ./filectrl.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_filepicker.o: ./filepicker.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_fontpicker.o: ./fontpicker.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_gauge.o: ./gauge.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_hyperlnk.o: ./hyperlnk.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_itemcontainer.o: ./itemcontainer.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_listbox.o: ./listbox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_notebook.o: ./notebook.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_odcombobox.o: ./odcombobox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_radiobox.o: ./radiobox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_searchctrl.o: ./searchctrl.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_slider.o: ./slider.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_spinbtn.o: ./spinbtn.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_static.o: ./static.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_statbmp.o: ./statbmp.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_textctrl.o: ./textctrl.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_toggle.o: ./toggle.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_widgets.o: ./widgets.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\widgets_sample_rc.o: ./../sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx
index 4793c3b031f1fcdd1aa389229b4035e27203e888..b2f678fc64c088e8bc52deb9cfd9bf8e60f3d222 100644 (file)
--- a/samples/widgets/makefile.unx
+++ b/samples/widgets/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index 24c455802c9097bac9eb48473004cbfb9e9d1177..efdbc10e91f26d90f3c62a0eb992bb4f942cc2a8 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -1,423 +1,448 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-WIDGETS_OBJECTS =  \\r
-       $(OBJS)\widgets_bmpcombobox.obj \\r
-       $(OBJS)\widgets_button.obj \\r
-       $(OBJS)\widgets_checkbox.obj \\r
-       $(OBJS)\widgets_choice.obj \\r
-       $(OBJS)\widgets_clrpicker.obj \\r
-       $(OBJS)\widgets_combobox.obj \\r
-       $(OBJS)\widgets_datepick.obj \\r
-       $(OBJS)\widgets_dirctrl.obj \\r
-       $(OBJS)\widgets_dirpicker.obj \\r
-       $(OBJS)\widgets_editlbox.obj \\r
-       $(OBJS)\widgets_filectrl.obj \\r
-       $(OBJS)\widgets_filepicker.obj \\r
-       $(OBJS)\widgets_fontpicker.obj \\r
-       $(OBJS)\widgets_gauge.obj \\r
-       $(OBJS)\widgets_hyperlnk.obj \\r
-       $(OBJS)\widgets_itemcontainer.obj \\r
-       $(OBJS)\widgets_listbox.obj \\r
-       $(OBJS)\widgets_notebook.obj \\r
-       $(OBJS)\widgets_odcombobox.obj \\r
-       $(OBJS)\widgets_radiobox.obj \\r
-       $(OBJS)\widgets_searchctrl.obj \\r
-       $(OBJS)\widgets_slider.obj \\r
-       $(OBJS)\widgets_spinbtn.obj \\r
-       $(OBJS)\widgets_static.obj \\r
-       $(OBJS)\widgets_statbmp.obj \\r
-       $(OBJS)\widgets_textctrl.obj \\r
-       $(OBJS)\widgets_toggle.obj \\r
-       $(OBJS)\widgets_widgets.obj \\r
-       $(OBJS)\widgets_sample.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\widgets.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe\r
-       -if exist $(OBJS)\widgets.ilk del $(OBJS)\widgets.ilk\r
-       -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb\r
-\r
-$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WIDGETS_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp\r
-\r
-$(OBJS)\widgets_button.obj: .\button.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\button.cpp\r
-\r
-$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp\r
-\r
-$(OBJS)\widgets_choice.obj: .\choice.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\choice.cpp\r
-\r
-$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp\r
-\r
-$(OBJS)\widgets_combobox.obj: .\combobox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp\r
-\r
-$(OBJS)\widgets_datepick.obj: .\datepick.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp\r
-\r
-$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp\r
-\r
-$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp\r
-\r
-$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp\r
-\r
-$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp\r
-\r
-$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp\r
-\r
-$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp\r
-\r
-$(OBJS)\widgets_gauge.obj: .\gauge.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp\r
-\r
-$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp\r
-\r
-$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp\r
-\r
-$(OBJS)\widgets_listbox.obj: .\listbox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp\r
-\r
-$(OBJS)\widgets_notebook.obj: .\notebook.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp\r
-\r
-$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp\r
-\r
-$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp\r
-\r
-$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp\r
-\r
-$(OBJS)\widgets_slider.obj: .\slider.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\slider.cpp\r
-\r
-$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp\r
-\r
-$(OBJS)\widgets_static.obj: .\static.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\static.cpp\r
-\r
-$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp\r
-\r
-$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp\r
-\r
-$(OBJS)\widgets_toggle.obj: .\toggle.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp\r
-\r
-$(OBJS)\widgets_widgets.obj: .\widgets.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp\r
-\r
-$(OBJS)\widgets_sample.res: .\..\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.obj \
+       $(OBJS)\widgets_button.obj \
+       $(OBJS)\widgets_checkbox.obj \
+       $(OBJS)\widgets_choice.obj \
+       $(OBJS)\widgets_clrpicker.obj \
+       $(OBJS)\widgets_combobox.obj \
+       $(OBJS)\widgets_datepick.obj \
+       $(OBJS)\widgets_dirctrl.obj \
+       $(OBJS)\widgets_dirpicker.obj \
+       $(OBJS)\widgets_editlbox.obj \
+       $(OBJS)\widgets_filectrl.obj \
+       $(OBJS)\widgets_filepicker.obj \
+       $(OBJS)\widgets_fontpicker.obj \
+       $(OBJS)\widgets_gauge.obj \
+       $(OBJS)\widgets_hyperlnk.obj \
+       $(OBJS)\widgets_itemcontainer.obj \
+       $(OBJS)\widgets_listbox.obj \
+       $(OBJS)\widgets_notebook.obj \
+       $(OBJS)\widgets_odcombobox.obj \
+       $(OBJS)\widgets_radiobox.obj \
+       $(OBJS)\widgets_searchctrl.obj \
+       $(OBJS)\widgets_slider.obj \
+       $(OBJS)\widgets_spinbtn.obj \
+       $(OBJS)\widgets_static.obj \
+       $(OBJS)\widgets_statbmp.obj \
+       $(OBJS)\widgets_textctrl.obj \
+       $(OBJS)\widgets_toggle.obj \
+       $(OBJS)\widgets_widgets.obj
+WIDGETS_RESOURCES =  \
+       $(OBJS)\widgets_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widgets.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+       -if exist $(OBJS)\widgets.ilk del $(OBJS)\widgets.ilk
+       -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb
+
+$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WIDGETS_OBJECTS) $(WIDGETS_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp
+
+$(OBJS)\widgets_button.obj: .\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\button.cpp
+
+$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp
+
+$(OBJS)\widgets_choice.obj: .\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\choice.cpp
+
+$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp
+
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp
+
+$(OBJS)\widgets_datepick.obj: .\datepick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp
+
+$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp
+
+$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp
+
+$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp
+
+$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp
+
+$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp
+
+$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp
+
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp
+
+$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp
+
+$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp
+
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp
+
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp
+
+$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp
+
+$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp
+
+$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp
+
+$(OBJS)\widgets_slider.obj: .\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\slider.cpp
+
+$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp
+
+$(OBJS)\widgets_static.obj: .\static.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\static.cpp
+
+$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp
+
+$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp
+
+$(OBJS)\widgets_toggle.obj: .\toggle.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp
+
+$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp
+
+$(OBJS)\widgets_sample.res: .\..\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index d1f10cf6d8c6aa5dc4db4ccb2293f45bdd5baead..046ef4da938cfe0013213238b70767611bf413ce 100644 (file)
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -1,373 +1,373 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-WIDGETS_OBJECTS =  &\r
-       $(OBJS)\widgets_bmpcombobox.obj &\r
-       $(OBJS)\widgets_button.obj &\r
-       $(OBJS)\widgets_checkbox.obj &\r
-       $(OBJS)\widgets_choice.obj &\r
-       $(OBJS)\widgets_clrpicker.obj &\r
-       $(OBJS)\widgets_combobox.obj &\r
-       $(OBJS)\widgets_datepick.obj &\r
-       $(OBJS)\widgets_dirctrl.obj &\r
-       $(OBJS)\widgets_dirpicker.obj &\r
-       $(OBJS)\widgets_editlbox.obj &\r
-       $(OBJS)\widgets_filectrl.obj &\r
-       $(OBJS)\widgets_filepicker.obj &\r
-       $(OBJS)\widgets_fontpicker.obj &\r
-       $(OBJS)\widgets_gauge.obj &\r
-       $(OBJS)\widgets_hyperlnk.obj &\r
-       $(OBJS)\widgets_itemcontainer.obj &\r
-       $(OBJS)\widgets_listbox.obj &\r
-       $(OBJS)\widgets_notebook.obj &\r
-       $(OBJS)\widgets_odcombobox.obj &\r
-       $(OBJS)\widgets_radiobox.obj &\r
-       $(OBJS)\widgets_searchctrl.obj &\r
-       $(OBJS)\widgets_slider.obj &\r
-       $(OBJS)\widgets_spinbtn.obj &\r
-       $(OBJS)\widgets_static.obj &\r
-       $(OBJS)\widgets_statbmp.obj &\r
-       $(OBJS)\widgets_textctrl.obj &\r
-       $(OBJS)\widgets_toggle.obj &\r
-       $(OBJS)\widgets_widgets.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\widgets.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe\r
-\r
-$(OBJS)\widgets.exe :  $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res\r
-       @%create $(OBJS)\widgets.lbc\r
-       @%append $(OBJS)\widgets.lbc option quiet\r
-       @%append $(OBJS)\widgets.lbc name $^@\r
-       @%append $(OBJS)\widgets.lbc option caseexact\r
-       @%append $(OBJS)\widgets.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widgets.lbc library %i\r
-       @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res\r
-       @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i\r
-       wlink @$(OBJS)\widgets.lbc\r
-\r
-$(OBJS)\widgets_bmpcombobox.obj :  .AUTODEPEND .\bmpcombobox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_button.obj :  .AUTODEPEND .\button.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_checkbox.obj :  .AUTODEPEND .\checkbox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_choice.obj :  .AUTODEPEND .\choice.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_clrpicker.obj :  .AUTODEPEND .\clrpicker.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_combobox.obj :  .AUTODEPEND .\combobox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_datepick.obj :  .AUTODEPEND .\datepick.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_dirctrl.obj :  .AUTODEPEND .\dirctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_dirpicker.obj :  .AUTODEPEND .\dirpicker.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_editlbox.obj :  .AUTODEPEND .\editlbox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_filectrl.obj :  .AUTODEPEND .\filectrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_filepicker.obj :  .AUTODEPEND .\filepicker.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_fontpicker.obj :  .AUTODEPEND .\fontpicker.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_gauge.obj :  .AUTODEPEND .\gauge.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_hyperlnk.obj :  .AUTODEPEND .\hyperlnk.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_itemcontainer.obj :  .AUTODEPEND .\itemcontainer.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_listbox.obj :  .AUTODEPEND .\listbox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_notebook.obj :  .AUTODEPEND .\notebook.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_odcombobox.obj :  .AUTODEPEND .\odcombobox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_radiobox.obj :  .AUTODEPEND .\radiobox.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_searchctrl.obj :  .AUTODEPEND .\searchctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_slider.obj :  .AUTODEPEND .\slider.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_spinbtn.obj :  .AUTODEPEND .\spinbtn.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_static.obj :  .AUTODEPEND .\static.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_statbmp.obj :  .AUTODEPEND .\statbmp.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_textctrl.obj :  .AUTODEPEND .\textctrl.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_toggle.obj :  .AUTODEPEND .\toggle.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_widgets.obj :  .AUTODEPEND .\widgets.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
-\r
-$(OBJS)\widgets_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+WIDGETS_OBJECTS =  &
+       $(OBJS)\widgets_bmpcombobox.obj &
+       $(OBJS)\widgets_button.obj &
+       $(OBJS)\widgets_checkbox.obj &
+       $(OBJS)\widgets_choice.obj &
+       $(OBJS)\widgets_clrpicker.obj &
+       $(OBJS)\widgets_combobox.obj &
+       $(OBJS)\widgets_datepick.obj &
+       $(OBJS)\widgets_dirctrl.obj &
+       $(OBJS)\widgets_dirpicker.obj &
+       $(OBJS)\widgets_editlbox.obj &
+       $(OBJS)\widgets_filectrl.obj &
+       $(OBJS)\widgets_filepicker.obj &
+       $(OBJS)\widgets_fontpicker.obj &
+       $(OBJS)\widgets_gauge.obj &
+       $(OBJS)\widgets_hyperlnk.obj &
+       $(OBJS)\widgets_itemcontainer.obj &
+       $(OBJS)\widgets_listbox.obj &
+       $(OBJS)\widgets_notebook.obj &
+       $(OBJS)\widgets_odcombobox.obj &
+       $(OBJS)\widgets_radiobox.obj &
+       $(OBJS)\widgets_searchctrl.obj &
+       $(OBJS)\widgets_slider.obj &
+       $(OBJS)\widgets_spinbtn.obj &
+       $(OBJS)\widgets_static.obj &
+       $(OBJS)\widgets_statbmp.obj &
+       $(OBJS)\widgets_textctrl.obj &
+       $(OBJS)\widgets_toggle.obj &
+       $(OBJS)\widgets_widgets.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\widgets.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+
+$(OBJS)\widgets.exe :  $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
+       @%create $(OBJS)\widgets.lbc
+       @%append $(OBJS)\widgets.lbc option quiet
+       @%append $(OBJS)\widgets.lbc name $^@
+       @%append $(OBJS)\widgets.lbc option caseexact
+       @%append $(OBJS)\widgets.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widgets.lbc library %i
+       @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res
+       @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i
+       wlink @$(OBJS)\widgets.lbc
+
+$(OBJS)\widgets_bmpcombobox.obj :  .AUTODEPEND .\bmpcombobox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_button.obj :  .AUTODEPEND .\button.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_checkbox.obj :  .AUTODEPEND .\checkbox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_choice.obj :  .AUTODEPEND .\choice.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_clrpicker.obj :  .AUTODEPEND .\clrpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_combobox.obj :  .AUTODEPEND .\combobox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_datepick.obj :  .AUTODEPEND .\datepick.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_dirctrl.obj :  .AUTODEPEND .\dirctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_dirpicker.obj :  .AUTODEPEND .\dirpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_editlbox.obj :  .AUTODEPEND .\editlbox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_filectrl.obj :  .AUTODEPEND .\filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_filepicker.obj :  .AUTODEPEND .\filepicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_fontpicker.obj :  .AUTODEPEND .\fontpicker.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_gauge.obj :  .AUTODEPEND .\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_hyperlnk.obj :  .AUTODEPEND .\hyperlnk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_itemcontainer.obj :  .AUTODEPEND .\itemcontainer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_listbox.obj :  .AUTODEPEND .\listbox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_notebook.obj :  .AUTODEPEND .\notebook.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_odcombobox.obj :  .AUTODEPEND .\odcombobox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_radiobox.obj :  .AUTODEPEND .\radiobox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_searchctrl.obj :  .AUTODEPEND .\searchctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_slider.obj :  .AUTODEPEND .\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_spinbtn.obj :  .AUTODEPEND .\spinbtn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_static.obj :  .AUTODEPEND .\static.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_statbmp.obj :  .AUTODEPEND .\statbmp.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_textctrl.obj :  .AUTODEPEND .\textctrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_toggle.obj :  .AUTODEPEND .\toggle.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_widgets.obj :  .AUTODEPEND .\widgets.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_sample.res :  .AUTODEPEND .\..\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/widgets/widgets.dsp b/samples/widgets/widgets.dsp
index 3ceea3a163499b247b0a2c002c1f93c6745f49bf..a2497c3ee345e9fb4d487b12c3738f0fe47302ac 100644 (file)
--- a/samples/widgets/widgets.dsp
+++ b/samples/widgets/widgets.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\widgets"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\widgets"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\widgets"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\widgets"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/widgets/widgets_vc7.vcproj b/samples/widgets/widgets_vc7.vcproj
index f331c5f67b09cdee551bc07562d1dcf81ee901af..e053d9c3b1cee2ddf287a0b497ba5f5fc602a18c 100644 (file)
--- a/samples/widgets/widgets_vc7.vcproj
+++ b/samples/widgets/widgets_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\widgets.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\widgets.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\widgets.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\widgets.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/widgets/widgets_vc8.vcproj b/samples/widgets/widgets_vc8.vcproj
index fb63de88d9b4adcd5f1e641465370698e45a1187..841715e0e509d008089127c8f0f3c5068bda0408 100644 (file)
--- a/samples/widgets/widgets_vc8.vcproj
+++ b/samples/widgets/widgets_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/widgets/widgets_vc9.vcproj b/samples/widgets/widgets_vc9.vcproj
index 139840f151841151b8cbacaf25acef2dbffdb42d..51d19e540723cc2c286ff5933eca22a4e6874784 100644 (file)
--- a/samples/widgets/widgets_vc9.vcproj
+++ b/samples/widgets/widgets_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\widgets.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\widgets.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 540bde42a7de72f3df67c1ae977c5a7588a95aba..020ff360ff5bf352d7502f4ebdc2626f90920112 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index 4968e78099554636c9b16565465c23b823d1cd36..83c3d9e54e15f3eab0cc12fe5afd1132da0ea448 100644 (file)
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIZARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WIZARD_OBJECTS =  \\r
-       $(OBJS)\wizard_wizard.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wizard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
-       -if exist $(OBJS)\wizard.tds del $(OBJS)\wizard.tds\r
-       -if exist $(OBJS)\wizard.ilc del $(OBJS)\wizard.ilc\r
-       -if exist $(OBJS)\wizard.ild del $(OBJS)\wizard.ild\r
-       -if exist $(OBJS)\wizard.ilf del $(OBJS)\wizard.ilf\r
-       -if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils\r
-\r
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS)  $(OBJS)\wizard_wizard.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_wizard.res\r
-|\r
-\r
-$(OBJS)\wizard_wizard.obj: .\wizard.cpp\r
-       $(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
-\r
-$(OBJS)\wizard_wizard.res: .\wizard.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wizard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIZARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WIZARD_OBJECTS =  \
+       $(OBJS)\wizard_wizard.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wizard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
+       -if exist $(OBJS)\wizard.tds del $(OBJS)\wizard.tds
+       -if exist $(OBJS)\wizard.ilc del $(OBJS)\wizard.ilc
+       -if exist $(OBJS)\wizard.ild del $(OBJS)\wizard.ild
+       -if exist $(OBJS)\wizard.ilf del $(OBJS)\wizard.ilf
+       -if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils
+
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS)  $(OBJS)\wizard_wizard.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_wizard.res
+|
+
+$(OBJS)\wizard_wizard.obj: .\wizard.cpp
+       $(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) .\wizard.cpp
+
+$(OBJS)\wizard_wizard.res: .\wizard.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wizard.rc
+

diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index c88976f74b884f46659e0475ce2bca4d63afe116..451ab65d073f769fdb7745876e0291b32a283903 100644 (file)
--- a/samples/wizard/makefile.gcc
+++ b/samples/wizard/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIZARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WIZARD_OBJECTS =  \\r
-       $(OBJS)\wizard_wizard.o \\r
-       $(OBJS)\wizard_wizard_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wizard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
-\r
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o\r
-       $(CXX) -o $@ $(WIZARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\wizard_wizard.o: ./wizard.cpp\r
-       $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\wizard_wizard_rc.o: ./wizard.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIZARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WIZARD_OBJECTS =  \
+       $(OBJS)\wizard_wizard.o \
+       $(OBJS)\wizard_wizard_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wizard.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
+
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o
+       $(CXX) -o $@ $(WIZARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\wizard_wizard.o: ./wizard.cpp
+       $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\wizard_wizard_rc.o: ./wizard.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx
index 984693d222bd8bd7a07360b5052fba64d11561f0..334fdd47c1166daa57ff59df993c79d55be48d60 100644 (file)
--- a/samples/wizard/makefile.unx
+++ b/samples/wizard/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index 449a13e107a69c0f3f0e5da3de952937ed17ac3f..d94ba38ed76466f561f31d991e33549071598a1d 100644 (file)
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-WIZARD_OBJECTS =  \\r
-       $(OBJS)\wizard_wizard.obj \\r
-       $(OBJS)\wizard_wizard.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wizard.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
-       -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk\r
-       -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb\r
-\r
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WIZARD_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\wizard_wizard.obj: .\wizard.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
-\r
-$(OBJS)\wizard_wizard.res: .\wizard.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wizard.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WIZARD_OBJECTS =  \
+       $(OBJS)\wizard_wizard.obj
+WIZARD_RESOURCES =  \
+       $(OBJS)\wizard_wizard.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wizard.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
+       -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk
+       -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb
+
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WIZARD_OBJECTS) $(WIZARD_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\wizard_wizard.obj: .\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp
+
+$(OBJS)\wizard_wizard.res: .\wizard.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wizard.rc
+

diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index 546da38a7bb70825c447d32e4955e8182ad1c4ae..5833db49891c264ec8f1adbb55366c95f2d55205 100644 (file)
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-WIZARD_OBJECTS =  &\r
-       $(OBJS)\wizard_wizard.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\wizard.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
-\r
-$(OBJS)\wizard.exe :  $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res\r
-       @%create $(OBJS)\wizard.lbc\r
-       @%append $(OBJS)\wizard.lbc option quiet\r
-       @%append $(OBJS)\wizard.lbc name $^@\r
-       @%append $(OBJS)\wizard.lbc option caseexact\r
-       @%append $(OBJS)\wizard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i\r
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wizard.lbc library %i\r
-       @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res\r
-       @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i\r
-       wlink @$(OBJS)\wizard.lbc\r
-\r
-$(OBJS)\wizard_wizard.obj :  .AUTODEPEND .\wizard.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $<\r
-\r
-$(OBJS)\wizard_wizard.res :  .AUTODEPEND .\wizard.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+WIZARD_OBJECTS =  &
+       $(OBJS)\wizard_wizard.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\wizard.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
+
+$(OBJS)\wizard.exe :  $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
+       @%create $(OBJS)\wizard.lbc
+       @%append $(OBJS)\wizard.lbc option quiet
+       @%append $(OBJS)\wizard.lbc name $^@
+       @%append $(OBJS)\wizard.lbc option caseexact
+       @%append $(OBJS)\wizard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wizard.lbc library %i
+       @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res
+       @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i
+       wlink @$(OBJS)\wizard.lbc
+
+$(OBJS)\wizard_wizard.obj :  .AUTODEPEND .\wizard.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $<
+
+$(OBJS)\wizard_wizard.res :  .AUTODEPEND .\wizard.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/wizard/wizard.dsp b/samples/wizard/wizard.dsp
index bfe1cad1d50a52bba614be69f10e3ea7717d6622..69b534b72479ce8214d9e7b517545d6285c6aaf8 100644 (file)
--- a/samples/wizard/wizard.dsp
+++ b/samples/wizard/wizard.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wizard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\wizard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\wizard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\wizard"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/wizard/wizard_vc7.vcproj b/samples/wizard/wizard_vc7.vcproj
index 941d1b2b6c67de7b9876f217ed946d432f99eab0..1e176a3317ef2a9f5064e549318bd05772fa572b 100644 (file)
--- a/samples/wizard/wizard_vc7.vcproj
+++ b/samples/wizard/wizard_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\wizard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\wizard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\wizard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\wizard.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/wizard/wizard_vc8.vcproj b/samples/wizard/wizard_vc8.vcproj
index eb6869f1f8a886c4e0f4bb1e54c61019c0863ea4..23c594d89cb7bd213fd68b9f75e88ce449293ae1 100644 (file)
--- a/samples/wizard/wizard_vc8.vcproj
+++ b/samples/wizard/wizard_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/wizard/wizard_vc9.vcproj b/samples/wizard/wizard_vc9.vcproj
index eb1ec381a119f5a859232da7aafebe91991c3375..c2268ff9d09c9e7a3a9eb947225f87862ae4d7a9 100644 (file)
--- a/samples/wizard/wizard_vc9.vcproj
+++ b/samples/wizard/wizard_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wizard.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wizard.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index 4e3b0b627f16e8d58aca1ca1697e58dd5f1076b6..6311495be16959cb0bacf9d0c85e1650c7e3087e 100644 (file)
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc
index 1bec3f9c2c3d4f8a4acd96ca486ff20d31011203..d0da81b7f0ec52e87df9181b2db709e5a7f89285 100644 (file)
--- a/samples/wrapsizer/makefile.bcc
+++ b/samples/wrapsizer/makefile.bcc
@@ -1,232 +1,232 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WRAPSIZER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WRAPSIZER_OBJECTS =  \\r
-       $(OBJS)\wrapsizer_wrapsizer.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wrapsizer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe\r
-       -if exist $(OBJS)\wrapsizer.tds del $(OBJS)\wrapsizer.tds\r
-       -if exist $(OBJS)\wrapsizer.ilc del $(OBJS)\wrapsizer.ilc\r
-       -if exist $(OBJS)\wrapsizer.ild del $(OBJS)\wrapsizer.ild\r
-       -if exist $(OBJS)\wrapsizer.ilf del $(OBJS)\wrapsizer.ilf\r
-       -if exist $(OBJS)\wrapsizer.ils del $(OBJS)\wrapsizer.ils\r
-\r
-$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS)  $(OBJS)\wrapsizer_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WRAPSIZER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wrapsizer_sample.res\r
-|\r
-\r
-$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp\r
-       $(CXX) -q -c -P -o$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WRAPSIZER_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WRAPSIZER_OBJECTS =  \
+       $(OBJS)\wrapsizer_wrapsizer.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wrapsizer.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe
+       -if exist $(OBJS)\wrapsizer.tds del $(OBJS)\wrapsizer.tds
+       -if exist $(OBJS)\wrapsizer.ilc del $(OBJS)\wrapsizer.ilc
+       -if exist $(OBJS)\wrapsizer.ild del $(OBJS)\wrapsizer.ild
+       -if exist $(OBJS)\wrapsizer.ilf del $(OBJS)\wrapsizer.ilf
+       -if exist $(OBJS)\wrapsizer.ils del $(OBJS)\wrapsizer.ils
+
+$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS)  $(OBJS)\wrapsizer_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WRAPSIZER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wrapsizer_sample.res
+|
+
+$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp
+       $(CXX) -q -c -P -o$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp
+

diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc
index 0f89f88002c540287d7695bd501185e8672c5363..2044eddb2db674e295b17663edfe9767689040bc 100644 (file)
--- a/samples/wrapsizer/makefile.gcc
+++ b/samples/wrapsizer/makefile.gcc
@@ -1,226 +1,226 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WRAPSIZER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WRAPSIZER_OBJECTS =  \\r
-       $(OBJS)\wrapsizer_sample_rc.o \\r
-       $(OBJS)\wrapsizer_wrapsizer.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wrapsizer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe\r
-\r
-$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample_rc.o\r
-       $(CXX) -o $@ $(WRAPSIZER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\wrapsizer_sample_rc.o: ./../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-$(OBJS)\wrapsizer_wrapsizer.o: ./wrapsizer.cpp\r
-       $(CXX) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WRAPSIZER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WRAPSIZER_OBJECTS =  \
+       $(OBJS)\wrapsizer_sample_rc.o \
+       $(OBJS)\wrapsizer_wrapsizer.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wrapsizer.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe
+
+$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample_rc.o
+       $(CXX) -o $@ $(WRAPSIZER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\wrapsizer_sample_rc.o: ./../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\wrapsizer_wrapsizer.o: ./wrapsizer.cpp
+       $(CXX) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/wrapsizer/makefile.unx b/samples/wrapsizer/makefile.unx
index 50991052d9326ed79fd03d0dc111d5eac69a6fb3..1859b64207777c8132ecfe29da4041fb58ca5da5 100644 (file)
--- a/samples/wrapsizer/makefile.unx
+++ b/samples/wrapsizer/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc
index 3bc7d7ef27cfad9db9a4338ba7d9d2016a5e62b2..650336d48012c360a9e0dc538d2efb95f31abe38 100644 (file)
--- a/samples/wrapsizer/makefile.vc
+++ b/samples/wrapsizer/makefile.vc
@@ -1,311 +1,336 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WRAPSIZER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-WRAPSIZER_OBJECTS =  \\r
-       $(OBJS)\wrapsizer_sample.res \\r
-       $(OBJS)\wrapsizer_wrapsizer.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wrapsizer.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe\r
-       -if exist $(OBJS)\wrapsizer.ilk del $(OBJS)\wrapsizer.ilk\r
-       -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb\r
-\r
-$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WRAPSIZER_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
-\r
-$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WRAPSIZER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WRAPSIZER_OBJECTS =  \
+       $(OBJS)\wrapsizer_wrapsizer.obj
+WRAPSIZER_RESOURCES =  \
+       $(OBJS)\wrapsizer_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wrapsizer.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe
+       -if exist $(OBJS)\wrapsizer.ilk del $(OBJS)\wrapsizer.ilk
+       -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb
+
+$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WRAPSIZER_OBJECTS) $(WRAPSIZER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp
+

diff --git a/samples/wrapsizer/makefile.wat b/samples/wrapsizer/makefile.wat
index 0792a956f94618e371ec323d96777bbe1666109f..d87f7a59e3ff9db58ba87cade2be157105ec7b73 100644 (file)
--- a/samples/wrapsizer/makefile.wat
+++ b/samples/wrapsizer/makefile.wat
@@ -1,260 +1,260 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WRAPSIZER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-WRAPSIZER_OBJECTS =  &\r
-       $(OBJS)\wrapsizer_wrapsizer.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\wrapsizer.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe\r
-\r
-$(OBJS)\wrapsizer.exe :  $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res\r
-       @%create $(OBJS)\wrapsizer.lbc\r
-       @%append $(OBJS)\wrapsizer.lbc option quiet\r
-       @%append $(OBJS)\wrapsizer.lbc name $^@\r
-       @%append $(OBJS)\wrapsizer.lbc option caseexact\r
-       @%append $(OBJS)\wrapsizer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WRAPSIZER_OBJECTS)) do @%append $(OBJS)\wrapsizer.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wrapsizer.lbc library %i\r
-       @%append $(OBJS)\wrapsizer.lbc option resource=$(OBJS)\wrapsizer_sample.res\r
-       @for %i in () do @%append $(OBJS)\wrapsizer.lbc option stack=%i\r
-       wlink @$(OBJS)\wrapsizer.lbc\r
-\r
-$(OBJS)\wrapsizer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\wrapsizer_wrapsizer.obj :  .AUTODEPEND .\wrapsizer.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WRAPSIZER_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WRAPSIZER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+WRAPSIZER_OBJECTS =  &
+       $(OBJS)\wrapsizer_wrapsizer.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\wrapsizer.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe
+
+$(OBJS)\wrapsizer.exe :  $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res
+       @%create $(OBJS)\wrapsizer.lbc
+       @%append $(OBJS)\wrapsizer.lbc option quiet
+       @%append $(OBJS)\wrapsizer.lbc name $^@
+       @%append $(OBJS)\wrapsizer.lbc option caseexact
+       @%append $(OBJS)\wrapsizer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WRAPSIZER_OBJECTS)) do @%append $(OBJS)\wrapsizer.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wrapsizer.lbc library %i
+       @%append $(OBJS)\wrapsizer.lbc option resource=$(OBJS)\wrapsizer_sample.res
+       @for %i in () do @%append $(OBJS)\wrapsizer.lbc option stack=%i
+       wlink @$(OBJS)\wrapsizer.lbc
+
+$(OBJS)\wrapsizer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\wrapsizer_wrapsizer.obj :  .AUTODEPEND .\wrapsizer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WRAPSIZER_CXXFLAGS) $<
+

diff --git a/samples/wrapsizer/wrapsizer.dsp b/samples/wrapsizer/wrapsizer.dsp
index a2629eca288dec314d45d3da59570a10c41e0439..4b94bc876a4abda3338bc1ed82bf15b2704ca905 100644 (file)
--- a/samples/wrapsizer/wrapsizer.dsp
+++ b/samples/wrapsizer/wrapsizer.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wrapsizer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\wrapsizer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\wrapsizer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\wrapsizer"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/wrapsizer/wrapsizer_vc7.vcproj b/samples/wrapsizer/wrapsizer_vc7.vcproj
index d8368f2dd57af4cadd66f89195a9c23bc08881c8..a233a84f30f340711e992b715837bb1df92e791e 100644 (file)
--- a/samples/wrapsizer/wrapsizer_vc7.vcproj
+++ b/samples/wrapsizer/wrapsizer_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\wrapsizer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\wrapsizer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/wrapsizer/wrapsizer_vc8.vcproj b/samples/wrapsizer/wrapsizer_vc8.vcproj
index 97a91fec15332ab4bd3c65bfbe7a1755bcf9d711..c3ff75913187b769f91e4617442fc5c02f7626d1 100644 (file)
--- a/samples/wrapsizer/wrapsizer_vc8.vcproj
+++ b/samples/wrapsizer/wrapsizer_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/wrapsizer/wrapsizer_vc9.vcproj b/samples/wrapsizer/wrapsizer_vc9.vcproj
index 825d2efdc53299b0aa1efb81c49f9a16e7ba29e0..024bd7719837617d9b4001f447b15ce8d9abb5f5 100644 (file)
--- a/samples/wrapsizer/wrapsizer_vc9.vcproj
+++ b/samples/wrapsizer/wrapsizer_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wrapsizer.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wrapsizer.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 4b833cf09e6cac3d28113599dbdc88411c6262a5..af00a8e83b54d138f677341d8f17883c8608ff30 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 8aee8d880091859c597221a0b23a07b3786f37b5..66842e22855798039ece2033391a96a82893638b 100644 (file)
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-XRCDEMO_OBJECTS =  \\r
-       $(OBJS)\xrcdemo_xrcdemo.obj \\r
-       $(OBJS)\xrcdemo_myframe.obj \\r
-       $(OBJS)\xrcdemo_derivdlg.obj \\r
-       $(OBJS)\xrcdemo_custclas.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XRC_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\xrcdemo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
-       -if exist $(OBJS)\xrcdemo.tds del $(OBJS)\xrcdemo.tds\r
-       -if exist $(OBJS)\xrcdemo.ilc del $(OBJS)\xrcdemo.ilc\r
-       -if exist $(OBJS)\xrcdemo.ild del $(OBJS)\xrcdemo.ild\r
-       -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf\r
-       -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils\r
-\r
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_xrcdemo.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
-       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r
-\r
-$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp\r
-       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp\r
-\r
-$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp\r
-       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp\r
-\r
-$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
-       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\xrcdemo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+XRCDEMO_OBJECTS =  \
+       $(OBJS)\xrcdemo_xrcdemo.obj \
+       $(OBJS)\xrcdemo_myframe.obj \
+       $(OBJS)\xrcdemo_derivdlg.obj \
+       $(OBJS)\xrcdemo_custclas.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XRC_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\xrcdemo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
+       -if exist $(OBJS)\xrcdemo.tds del $(OBJS)\xrcdemo.tds
+       -if exist $(OBJS)\xrcdemo.ilc del $(OBJS)\xrcdemo.ilc
+       -if exist $(OBJS)\xrcdemo.ild del $(OBJS)\xrcdemo.ild
+       -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf
+       -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils
+
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_xrcdemo.res
+|
+
+data: 
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp
+
+$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp
+
+$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp
+
+$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp
+
+$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\xrcdemo.rc
+

diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 530a092a40551ea96581508d82cadcccc1ee83f9..5c6a3132aee1013c415e660ed785f4c9c7969f2e 100644 (file)
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -1,258 +1,258 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-XRCDEMO_OBJECTS =  \\r
-       $(OBJS)\xrcdemo_xrcdemo.o \\r
-       $(OBJS)\xrcdemo_myframe.o \\r
-       $(OBJS)\xrcdemo_derivdlg.o \\r
-       $(OBJS)\xrcdemo_custclas.o \\r
-       $(OBJS)\xrcdemo_xrcdemo_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XRC_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\xrcdemo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
-\r
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o\r
-       $(CXX) -o $@ $(XRCDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp\r
-       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\xrcdemo_myframe.o: ./myframe.cpp\r
-       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\xrcdemo_derivdlg.o: ./derivdlg.cpp\r
-       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\xrcdemo_custclas.o: ./custclas.cpp\r
-       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\xrcdemo_xrcdemo_rc.o: ./xrcdemo.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+XRCDEMO_OBJECTS =  \
+       $(OBJS)\xrcdemo_xrcdemo.o \
+       $(OBJS)\xrcdemo_myframe.o \
+       $(OBJS)\xrcdemo_derivdlg.o \
+       $(OBJS)\xrcdemo_custclas.o \
+       $(OBJS)\xrcdemo_xrcdemo_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XRC_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\xrcdemo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
+
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
+       $(CXX) -o $@ $(XRCDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp
+       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdemo_myframe.o: ./myframe.cpp
+       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdemo_derivdlg.o: ./derivdlg.cpp
+       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdemo_custclas.o: ./custclas.cpp
+       $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdemo_xrcdemo_rc.o: ./xrcdemo.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx
index d560df5a2d6b7d14f4d6a58332fc681b73c85b4d..4b6dfacc6e0f5317e800440fc63796f25156f43c 100644 (file)
--- a/samples/xrc/makefile.unx
+++ b/samples/xrc/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index dd46281cdd1c3891e5d5989bfec4b34ef0785b96..7f932d6c6319126d6ac0545940fe77108838fa0c 100644 (file)
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -1,343 +1,368 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-XRCDEMO_OBJECTS =  \\r
-       $(OBJS)\xrcdemo_xrcdemo.obj \\r
-       $(OBJS)\xrcdemo_myframe.obj \\r
-       $(OBJS)\xrcdemo_derivdlg.obj \\r
-       $(OBJS)\xrcdemo_custclas.obj \\r
-       $(OBJS)\xrcdemo_xrcdemo.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XRC_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\xrcdemo.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
-       -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk\r
-       -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb\r
-\r
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(XRCDEMO_OBJECTS)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r
-\r
-$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp\r
-\r
-$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp\r
-\r
-$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\xrcdemo.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+XRCDEMO_OBJECTS =  \
+       $(OBJS)\xrcdemo_xrcdemo.obj \
+       $(OBJS)\xrcdemo_myframe.obj \
+       $(OBJS)\xrcdemo_derivdlg.obj \
+       $(OBJS)\xrcdemo_custclas.obj
+XRCDEMO_RESOURCES =  \
+       $(OBJS)\xrcdemo_xrcdemo.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XRC_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\xrcdemo.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
+       -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk
+       -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb
+
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp
+
+$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp
+
+$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp
+
+$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp
+
+$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\xrcdemo.rc
+

diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index a9d7ec4d2f29b324f0f390420f5435d2850e1608..6204586a9df6c34522b8218737891ec06220f711 100644 (file)
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -1,296 +1,296 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_XRC_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XRC_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-XRCDEMO_OBJECTS =  &\r
-       $(OBJS)\xrcdemo_xrcdemo.obj &\r
-       $(OBJS)\xrcdemo_myframe.obj &\r
-       $(OBJS)\xrcdemo_derivdlg.obj &\r
-       $(OBJS)\xrcdemo_custclas.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\xrcdemo.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
-\r
-$(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res\r
-       @%create $(OBJS)\xrcdemo.lbc\r
-       @%append $(OBJS)\xrcdemo.lbc option quiet\r
-       @%append $(OBJS)\xrcdemo.lbc name $^@\r
-       @%append $(OBJS)\xrcdemo.lbc option caseexact\r
-       @%append $(OBJS)\xrcdemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i\r
-       @for %i in ( $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i\r
-       @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res\r
-       @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i\r
-       wlink @$(OBJS)\xrcdemo.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
-\r
-$(OBJS)\xrcdemo_myframe.obj :  .AUTODEPEND .\myframe.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
-\r
-$(OBJS)\xrcdemo_derivdlg.obj :  .AUTODEPEND .\derivdlg.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
-\r
-$(OBJS)\xrcdemo_custclas.obj :  .AUTODEPEND .\custclas.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
-\r
-$(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_XRC_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XRC_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+XRCDEMO_OBJECTS =  &
+       $(OBJS)\xrcdemo_xrcdemo.obj &
+       $(OBJS)\xrcdemo_myframe.obj &
+       $(OBJS)\xrcdemo_derivdlg.obj &
+       $(OBJS)\xrcdemo_custclas.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\xrcdemo.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
+
+$(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
+       @%create $(OBJS)\xrcdemo.lbc
+       @%append $(OBJS)\xrcdemo.lbc option quiet
+       @%append $(OBJS)\xrcdemo.lbc name $^@
+       @%append $(OBJS)\xrcdemo.lbc option caseexact
+       @%append $(OBJS)\xrcdemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i
+       @for %i in ( $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i
+       @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
+       @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i
+       wlink @$(OBJS)\xrcdemo.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
+
+$(OBJS)\xrcdemo_myframe.obj :  .AUTODEPEND .\myframe.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
+
+$(OBJS)\xrcdemo_derivdlg.obj :  .AUTODEPEND .\derivdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
+
+$(OBJS)\xrcdemo_custclas.obj :  .AUTODEPEND .\custclas.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
+
+$(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/samples/xrc/xrcdemo.dsp b/samples/xrc/xrcdemo.dsp
index 16dc181ca4cbebd0a5d8662886660c82a2bded7b..677b08716055aef7fc9d8c66c601df1a5cac27b3 100644 (file)
--- a/samples/xrc/xrcdemo.dsp
+++ b/samples/xrc/xrcdemo.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\xrcdemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\xrcdemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\xrcdemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\xrcdemo"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj
index b6d66f4e12bab47024684942924f62dc79c69762..323f2f8036c84b1375ddad90a6132202e92ff68e 100644 (file)
--- a/samples/xrc/xrcdemo_vc7.vcproj
+++ b/samples/xrc/xrcdemo_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\xrcdemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\xrcdemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj
index 512b6213ca53376238cc5dc79d5945f5d6003374..373e1fbc97a8b9869360e9e62fa1be9d0dec4d4e 100644 (file)
--- a/samples/xrc/xrcdemo_vc8.vcproj
+++ b/samples/xrc/xrcdemo_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj
index 386dc7f88e2e96e53782a1903ae64bbc34114e73..5ecd4e6944f47da84db03aeb2d447c11b0d02722 100644 (file)
--- a/samples/xrc/xrcdemo_vc9.vcproj
+++ b/samples/xrc/xrcdemo_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_xrc.lib  wxmsw29u_html.lib  wxmsw29u_adv.lib  wxmsw29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_xrc.lib  wxmswuniv29u_html.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_core.lib  wxbase29u_xml.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\xrcdemo.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\xrcdemo.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3d849b2afd482626b39751eb209860cf33d8e638..0c6ecf8c08ebfd7ba96767c53d7d9fa17d8402ad 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 0da88ac406ec0d1e05e622c5c8df8099f1463e49..984aaf7fc393678c973bd3c73bd3a2208d5608d6 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/tests/benchmarks/bench.dsp b/tests/benchmarks/bench.dsp
index c8f694c387337d515f25db44852dc46ac1667347..cf1a501e8578d9c4c4f72f3633cef58d576ad4d0 100644 (file)
--- a/tests/benchmarks/bench.dsp
+++ b/tests/benchmarks/bench.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\bench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\bench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\bench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\bench"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/tests/benchmarks/bench_vc7.vcproj b/tests/benchmarks/bench_vc7.vcproj
index aabc897c5f096d06398f58edfe6a906ffbcaa9f8..2a91a56cda671fcf12951ef1c73b848d5b7b313f 100644 (file)
--- a/tests/benchmarks/bench_vc7.vcproj
+++ b/tests/benchmarks/bench_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\bench.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\bench.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\bench.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\bench.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/tests/benchmarks/bench_vc8.vcproj b/tests/benchmarks/bench_vc8.vcproj
index d36e1fd449eac5fb34a108cfb7304477fa7ecbcd..14fa7a90815099915cb93063ef3f0a22808af5e2 100644 (file)
--- a/tests/benchmarks/bench_vc8.vcproj
+++ b/tests/benchmarks/bench_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/tests/benchmarks/bench_vc9.vcproj b/tests/benchmarks/bench_vc9.vcproj
index 3ed943fce4746a3ff192c8dbc52aba9b22faccb4..847d68dd225beb6ca147be18ed1de62267038d22 100644 (file)
--- a/tests/benchmarks/bench_vc9.vcproj
+++ b/tests/benchmarks/bench_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\bench.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\bench.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index 0b768d095f348b35d30aeda0cf1cd9ab883f19fd..78e018a138becee33a07ba643faf0782717c835a 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -1,222 +1,222 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-BENCH_OBJECTS =  \\r
-       $(OBJS)\bench_bench.obj \\r
-       $(OBJS)\bench_htmlpars.obj \\r
-       $(OBJS)\bench_htmltag.obj \\r
-       $(OBJS)\bench_ipcclient.obj \\r
-       $(OBJS)\bench_mbconv.obj \\r
-       $(OBJS)\bench_strings.obj \\r
-       $(OBJS)\bench_tls.obj \\r
-       $(OBJS)\bench_printfbench.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bench.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
-       -if exist $(OBJS)\bench.tds del $(OBJS)\bench.tds\r
-       -if exist $(OBJS)\bench.ilc del $(OBJS)\bench.ilc\r
-       -if exist $(OBJS)\bench.ild del $(OBJS)\bench.ild\r
-       -if exist $(OBJS)\bench.ilf del $(OBJS)\bench.ilf\r
-       -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils\r
-\r
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\bench_bench.obj: .\bench.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
-\r
-$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp\r
-\r
-$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp\r
-\r
-$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
-\r
-$(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
-\r
-$(OBJS)\bench_strings.obj: .\strings.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\strings.cpp\r
-\r
-$(OBJS)\bench_tls.obj: .\tls.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\tls.cpp\r
-\r
-$(OBJS)\bench_printfbench.obj: .\printfbench.cpp\r
-       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS =  \
+       $(OBJS)\bench_bench.obj \
+       $(OBJS)\bench_htmlpars.obj \
+       $(OBJS)\bench_htmltag.obj \
+       $(OBJS)\bench_ipcclient.obj \
+       $(OBJS)\bench_mbconv.obj \
+       $(OBJS)\bench_strings.obj \
+       $(OBJS)\bench_tls.obj \
+       $(OBJS)\bench_printfbench.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+       -if exist $(OBJS)\bench.tds del $(OBJS)\bench.tds
+       -if exist $(OBJS)\bench.ilc del $(OBJS)\bench.ilc
+       -if exist $(OBJS)\bench.ild del $(OBJS)\bench.ild
+       -if exist $(OBJS)\bench.ilf del $(OBJS)\bench.ilf
+       -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\bench_bench.obj: .\bench.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
+
+$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
+
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
+$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
+
+$(OBJS)\bench_strings.obj: .\strings.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\strings.cpp
+
+$(OBJS)\bench_tls.obj: .\tls.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\tls.cpp
+
+$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
+

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 5d6016104d69e558146eaf3ec0e3785e011de498..ad8cc76dbdcc46c7c9cd490046fa5d7e5aa57e3b 100644 (file)
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -1,215 +1,215 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-BENCH_OBJECTS =  \\r
-       $(OBJS)\bench_bench.o \\r
-       $(OBJS)\bench_htmlpars.o \\r
-       $(OBJS)\bench_htmltag.o \\r
-       $(OBJS)\bench_ipcclient.o \\r
-       $(OBJS)\bench_mbconv.o \\r
-       $(OBJS)\bench_strings.o \\r
-       $(OBJS)\bench_tls.o \\r
-       $(OBJS)\bench_printfbench.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bench.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
-\r
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
-       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (htmltest.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\bench_bench.o: ./bench.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_mbconv.o: ./mbconv.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_strings.o: ./strings.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_tls.o: ./tls.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\bench_printfbench.o: ./printfbench.cpp\r
-       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS =  \
+       $(OBJS)\bench_bench.o \
+       $(OBJS)\bench_htmlpars.o \
+       $(OBJS)\bench_htmltag.o \
+       $(OBJS)\bench_ipcclient.o \
+       $(OBJS)\bench_mbconv.o \
+       $(OBJS)\bench_strings.o \
+       $(OBJS)\bench_tls.o \
+       $(OBJS)\bench_printfbench.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (htmltest.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\bench_bench.o: ./bench.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_mbconv.o: ./mbconv.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_strings.o: ./strings.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_tls.o: ./tls.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\bench_printfbench.o: ./printfbench.cpp
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index 0a1d76e1f83792ac4454633f28f2ce447f6c8cd5..3f95f20983e0af227e1407fb248d13674a5f2d67 100644 (file)
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -1,282 +1,306 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-BENCH_OBJECTS =  \\r
-       $(OBJS)\bench_bench.obj \\r
-       $(OBJS)\bench_htmlpars.obj \\r
-       $(OBJS)\bench_htmltag.obj \\r
-       $(OBJS)\bench_ipcclient.obj \\r
-       $(OBJS)\bench_mbconv.obj \\r
-       $(OBJS)\bench_strings.obj \\r
-       $(OBJS)\bench_tls.obj \\r
-       $(OBJS)\bench_printfbench.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\bench.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
-       -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk\r
-       -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb\r
-\r
-$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(BENCH_OBJECTS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\bench_bench.obj: .\bench.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
-\r
-$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp\r
-\r
-$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp\r
-\r
-$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
-\r
-$(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
-\r
-$(OBJS)\bench_strings.obj: .\strings.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp\r
-\r
-$(OBJS)\bench_tls.obj: .\tls.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp\r
-\r
-$(OBJS)\bench_printfbench.obj: .\printfbench.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS =  \
+       $(OBJS)\bench_bench.obj \
+       $(OBJS)\bench_htmlpars.obj \
+       $(OBJS)\bench_htmltag.obj \
+       $(OBJS)\bench_ipcclient.obj \
+       $(OBJS)\bench_mbconv.obj \
+       $(OBJS)\bench_strings.obj \
+       $(OBJS)\bench_tls.obj \
+       $(OBJS)\bench_printfbench.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\bench.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+       -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk
+       -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb
+
+$(OBJS)\bench.exe: $(BENCH_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(BENCH_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\bench_bench.obj: .\bench.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp
+
+$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp
+
+$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp
+
+$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp
+
+$(OBJS)\bench_mbconv.obj: .\mbconv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp
+
+$(OBJS)\bench_strings.obj: .\strings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp
+
+$(OBJS)\bench_tls.obj: .\tls.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp
+
+$(OBJS)\bench_printfbench.obj: .\printfbench.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp
+

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index da5d60d15ad46690e3edf114f88ea8b59eedb59f..5e673e09da1046adfe43caf52b48e49134aa23f8 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -1,276 +1,276 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-BENCH_OBJECTS =  &\r
-       $(OBJS)\bench_bench.obj &\r
-       $(OBJS)\bench_htmlpars.obj &\r
-       $(OBJS)\bench_htmltag.obj &\r
-       $(OBJS)\bench_ipcclient.obj &\r
-       $(OBJS)\bench_mbconv.obj &\r
-       $(OBJS)\bench_strings.obj &\r
-       $(OBJS)\bench_tls.obj &\r
-       $(OBJS)\bench_printfbench.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\bench.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
-\r
-$(OBJS)\bench.exe :  $(BENCH_OBJECTS)\r
-       @%create $(OBJS)\bench.lbc\r
-       @%append $(OBJS)\bench.lbc option quiet\r
-       @%append $(OBJS)\bench.lbc name $^@\r
-       @%append $(OBJS)\bench.lbc option caseexact\r
-       @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i\r
-       @%append $(OBJS)\bench.lbc\r
-       @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i\r
-       wlink @$(OBJS)\bench.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_strings.obj :  .AUTODEPEND .\strings.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_tls.obj :  .AUTODEPEND .\tls.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
-$(OBJS)\bench_printfbench.obj :  .AUTODEPEND .\printfbench.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS =  &
+       $(OBJS)\bench_bench.obj &
+       $(OBJS)\bench_htmlpars.obj &
+       $(OBJS)\bench_htmltag.obj &
+       $(OBJS)\bench_ipcclient.obj &
+       $(OBJS)\bench_mbconv.obj &
+       $(OBJS)\bench_strings.obj &
+       $(OBJS)\bench_tls.obj &
+       $(OBJS)\bench_printfbench.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\bench.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe
+
+$(OBJS)\bench.exe :  $(BENCH_OBJECTS)
+       @%create $(OBJS)\bench.lbc
+       @%append $(OBJS)\bench.lbc option quiet
+       @%append $(OBJS)\bench.lbc name $^@
+       @%append $(OBJS)\bench.lbc option caseexact
+       @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i
+       @%append $(OBJS)\bench.lbc
+       @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i
+       wlink @$(OBJS)\bench.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_strings.obj :  .AUTODEPEND .\strings.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_tls.obj :  .AUTODEPEND .\tls.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_printfbench.obj :  .AUTODEPEND .\printfbench.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index c86b0f1b3cfad752fcac55a71fa023939d381186..a89dd76b39f8b1fe3188b5e3c54d6faa1b105f9e 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -168,10 +168,10 @@ LIBTYPE_SUFFIX = lib
 LIBTYPE_SUFFIX = dll
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
@@ -242,13 +242,13 @@ __OPTIMIZEFLAG = -Od
 __OPTIMIZEFLAG = -O2
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG =
+__THREADSFLAG = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG = mt
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_0 =
+__THREADSFLAG_0 = 
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_0 = -tWM
@@ -257,13 +257,13 @@ __THREADSFLAG_0 = -tWM
 __RUNTIME_LIBS = -tWR
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS =
+__RUNTIME_LIBS = 
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_0 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_0 =
+__RUNTIME_LIBS_0 = 
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -339,7 +339,7 @@ $(OBJS):
 
 all: $(OBJS)\test.exe $(__test_gui___depname) data fr
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
@@ -368,11 +368,11 @@ $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\t
 |
 !endif
 
-data:
+data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-fr:
+fr: 
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
 

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index d2c93527c3b56f1033d131594ebb67431280f863..79269cebb86be10696a7f0572c2dcba11a5fab5a 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -164,10 +164,10 @@ ifeq ($(SHARED),1)
 LIBTYPE_SUFFIX = dll
 endif
 ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 endif
 ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 endif
 ifeq ($(USE_GUI),1)
 __test_gui___depname = $(OBJS)\test_gui.exe
@@ -243,13 +243,13 @@ ifeq ($(USE_RTTI),0)
 __RTTIFLAG = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)
-__RTTIFLAG =
+__RTTIFLAG = 
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -310,17 +310,17 @@ endif
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 endif
 ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
+__DEBUGINFO = 
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
+__THREADSFLAG = 
 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
@@ -335,7 +335,7 @@ $(OBJS):
 
 all: $(OBJS)\test.exe $(__test_gui___depname) data fr
 
-clean:
+clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
@@ -349,11 +349,11 @@ $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
        $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
 endif
 
-data:
+data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
-fr:
+fr: 
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
        for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr
 

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 504d1ef33f86b2a42df1ad9ea7d0dd7a8642c3cb..547b183bbfef6c91fa33d33700ebe02e0a6a1176 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -20,8 +20,8 @@ LIBDIRNAME = \
        .\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
        $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
@@ -98,15 +98,15 @@ TEST_OBJECTS =  \
        $(OBJS)\test_weakref.obj \
        $(OBJS)\test_xlocale.obj \
        $(OBJS)\test_xmltest.obj
-TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. $(__DLLFLAG_p) \
-       /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(__DEBUGINFO_19) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. \
+       $(__DLLFLAG_p) /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \
+       /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_dummy.obj \
        $(OBJS)\test_gui_test.obj \
@@ -192,37 +192,61 @@ LINK_TARGET_CPU = /MACHINE:AMD64
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_0)
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
+__RUNTIME_LIBS_10 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_0)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_19 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_19 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_19 = $(__DEBUGRUNTIME_0)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_17_p_1 = /d _DEBUG
+____DEBUGRUNTIME_20_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_17_p_1 =
+____DEBUGRUNTIME_20_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_17_p_1 =
+____DEBUGRUNTIME_20_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_17_p_1 = /d _DEBUG
+____DEBUGRUNTIME_20_p_1 = /d _DEBUG
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_23 = D
+__RUNTIME_LIBS_27 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_23 = $(__THREADSFLAG)
+__RUNTIME_LIBS_27 = $(__THREADSFLAG)
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 __NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
@@ -293,10 +317,10 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 __DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO =
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO =
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO = /Zi
@@ -305,10 +329,10 @@ __DEBUGINFO = /Zi
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
@@ -317,10 +341,10 @@ __DEBUGINFO_1 = /DEBUG
 ____DEBUGRUNTIME = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME =
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME =
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME = /D_DEBUG
@@ -329,14 +353,26 @@ ____DEBUGRUNTIME = /D_DEBUG
 __DEBUGRUNTIME = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME =
+__DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME =
+__DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME = d
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_0 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_0 = 
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif
@@ -350,13 +386,13 @@ __THREADSFLAG = L
 __THREADSFLAG = T
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG =
+__RTTIFLAG = 
 !endif
 !if "$(USE_RTTI)" == "1"
 __RTTIFLAG = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG = /EHsc
@@ -429,7 +465,7 @@ $(OBJS):
 
 all: $(OBJS)\test.exe $(__test_gui___depname) data fr
 
-clean:
+clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -452,11 +488,11 @@ $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\te
 <<
 !endif
 
-data:
+data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-fr:
+fr: 
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
 
@@ -671,7 +707,7 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
 
 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_17_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_20_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
 
 $(OBJS)\test_gui_test.obj: .\test.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 0c5d3f630e3715c84b980e682c2078afc44a56a0..c06ffe8443ceacb9dfb70606156fdafe0694ad12 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -63,10 +63,10 @@ LIBTYPE_SUFFIX = dll
 !endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 
 !endif
 !ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =  
 !endif
 __test_gui___depname =
 !ifeq USE_GUI 1
@@ -136,11 +136,11 @@ __DEBUGINFO_1 = debug all
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
+__DEBUGINFO_1 = 
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
@@ -154,7 +154,7 @@ __OPTIMIZEFLAG = -ot -ox
 !endif
 __THREADSFLAG =
 !ifeq USE_THREADS 0
-__THREADSFLAG =
+__THREADSFLAG = 
 !endif
 !ifeq USE_THREADS 1
 __THREADSFLAG = -bm
@@ -164,18 +164,18 @@ __RUNTIME_LIBS =
 __RUNTIME_LIBS = -br
 !endif
 !ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS =
+__RUNTIME_LIBS = 
 !endif
 __RTTIFLAG =
 !ifeq USE_RTTI 0
-__RTTIFLAG =
+__RTTIFLAG = 
 !endif
 !ifeq USE_RTTI 1
 __RTTIFLAG = -xr
 !endif
 __EXCEPTIONSFLAG =
 !ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG =
+__EXCEPTIONSFLAG = 
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG = -xs
@@ -371,7 +371,7 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr
 
-clean : .SYMBOLIC
+clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
@@ -406,11 +406,11 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        wlink @$(OBJS)\test_gui.lbc
 !endif
 
-data : .SYMBOLIC
+data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-fr : .SYMBOLIC
+fr : .SYMBOLIC 
        if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
        for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr
 

diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index b7cdc5070c98749c60b53b109370e8d1ce5a6c5c..0389ed568e80be337b93b32da0d99c3d2edc87d2 100644 (file)
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\test"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -293,10 +293,10 @@ SOURCE=.\events\evthandler.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\events\evtsource.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\events\evtsource.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\exec\exec.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -341,10 +341,10 @@ SOURCE=.\formatconverter\formatconvertertest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\fswatcher\fswatchertest.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\fswatcher\fswatchertest.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\hashes\hashes.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index 0248f7c5ef2e7487786c223d00a00b0a10dda6ca..65dbc442d7ad4ca7d125db2f631a678c020314af 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\test_gui"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE\r
 BSC32=bscmake.exe\r
@@ -243,10 +243,10 @@ SOURCE=.\events\clone.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\graphics\colour.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\graphics\colour.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\controls\comboboxtest.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index bf32fc26838cd6eecd67b1fd63e7b9151a4ec564..5ae3573fa2c9b82987859e089434203aff9ca609 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -116,13 +116,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -249,13 +251,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -382,13 +386,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -515,13 +521,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -648,9 +656,9 @@
                                RelativePath=".\events\evthandler.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\events\evtsource.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\events\evtsource.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\exec\exec.cpp">\r
                        </File>\r
                        <File\r
@@ -684,9 +692,9 @@
                                RelativePath=".\formatconverter\formatconvertertest.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\fswatcher\fswatchertest.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\fswatcher\fswatchertest.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\hashes\hashes.cpp">\r
                        </File>\r
                        <File\r

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 9555ecd574824c014843de0d43ff4cf59698487a..570568c128ea5ef674ecf1a666192b8a95f1d032 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -116,13 +116,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
@@ -249,13 +251,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
@@ -382,13 +386,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
@@ -515,13 +521,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
@@ -564,9 +572,9 @@
                                RelativePath=".\events\clone.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\colour.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\graphics\colour.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\comboboxtest.cpp">\r
                        </File>\r
                        <File\r

diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index ccdd348242765cf7d235e1f31c4cb5f5def07630..27c3c46f64558dbf1e93c31c6eb849f6e3cd1678 100644 (file)
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -182,7 +182,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -190,6 +190,8 @@
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -379,7 +381,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -387,6 +389,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -576,7 +580,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -584,6 +588,8 @@
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -773,7 +779,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -781,6 +787,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -940,10 +948,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\events\evtsource.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\events\evtsource.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\exec\exec.cpp"\r
                                >\r
                        </File>\r
@@ -988,10 +996,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\fswatcher\fswatchertest.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\fswatcher\fswatchertest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\hashes\hashes.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 0dacb80a0490491b91a0b1a6df15f5b180ad0eab..53f4863ca4d928e1d01f8e6b93bf62e4775add51 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -182,7 +182,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -190,6 +190,8 @@
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -379,7 +381,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -387,6 +389,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -576,7 +580,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -584,6 +588,8 @@
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -773,7 +779,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -781,6 +787,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -828,10 +836,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\colour.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\graphics\colour.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index a8a501511b0e5336d6cbbca881fe5c7f7d4188e6..fc3f179dcc6529c8a16f5a859ae866c2a9bc5ef3 100644 (file)
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
@@ -139,7 +139,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
@@ -178,7 +178,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -186,6 +186,8 @@
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -233,7 +235,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
@@ -329,7 +331,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
@@ -368,7 +370,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -376,6 +378,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -423,7 +427,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
@@ -519,7 +523,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -613,7 +619,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
@@ -709,7 +715,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCMIDLTool"
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
@@ -748,7 +754,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -756,6 +762,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -912,10 +920,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\events\evtsource.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\events\evtsource.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\exec\exec.cpp"\r
                                >\r
                        </File>\r
@@ -960,10 +968,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\fswatcher\fswatchertest.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\fswatcher\fswatchertest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\hashes\hashes.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index e9c44cc253981642c482e036bee7f201ef35a574..3fcefe9a7fd05557c40cc6ca18e5326e712aed90 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -139,7 +139,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -178,7 +178,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -186,6 +186,8 @@
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -233,7 +235,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -329,7 +331,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -368,7 +370,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -376,6 +378,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -423,7 +427,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -519,7 +523,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -613,7 +619,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -709,7 +715,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -748,7 +754,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -756,6 +762,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -800,10 +808,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\colour.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\graphics\colour.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                                >\r
                        </File>\r

diff --git a/utils/Makefile.in b/utils/Makefile.in
index dbc96d8fce86337c6bcd30c1c3f7136ee41d9ed1..5792a120a4b9d5939c00cae176d5781954801692 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in
index 05bb6fb3253a69e1bf112c282b7261dea6cc4d9b..f386bb7bf50e81ca7f5242a2902718e4f26d7192 100644 (file)
--- a/utils/emulator/src/Makefile.in
+++ b/utils/emulator/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/emulator/src/emulator.dsp b/utils/emulator/src/emulator.dsp
index 7bbff6f35e24c1a91a127f478cb487eb918066c6..6feef867e7ab9576ecf65c8eec2236f9e650afb9 100644 (file)
--- a/utils/emulator/src/emulator.dsp
+++ b/utils/emulator/src/emulator.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxemulator"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxemulator"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxemulator"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\wxemulator"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj
index fc72bfeb8f9fc664f1e9442de35b8352974d8e4e..285a19e4cd8c19a2254ebace7a29ff5580e52e15 100644 (file)
--- a/utils/emulator/src/emulator_vc7.vcproj
+++ b/utils/emulator/src/emulator_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj
index 48738539145aa123f69b409cf788ac2ef040087c..4b8d0ebb47bd37f05bbbf30f34fbd72b6d0f59b0 100644 (file)
--- a/utils/emulator/src/emulator_vc8.vcproj
+++ b/utils/emulator/src/emulator_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/emulator/src/emulator_vc9.vcproj b/utils/emulator/src/emulator_vc9.vcproj
index 1d423f9da963c89f4b4165ba8179fc67ed50d3fd..609c52ee83cf826eb10acd6064694ec5a3b3ff4f 100644 (file)
--- a/utils/emulator/src/emulator_vc9.vcproj
+++ b/utils/emulator/src/emulator_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxemulator.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc
index 7844f22563c6708e93091a063e58421881cdc796..c7d0fa829cd78d81dcfa627387174c47a8b6e48b 100644 (file)
--- a/utils/emulator/src/makefile.bcc
+++ b/utils/emulator/src/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXEMULATOR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WXEMULATOR_OBJECTS =  \\r
-       $(OBJS)\wxemulator_emulator.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxemulator.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
-       -if exist $(OBJS)\wxemulator.tds del $(OBJS)\wxemulator.tds\r
-       -if exist $(OBJS)\wxemulator.ilc del $(OBJS)\wxemulator.ilc\r
-       -if exist $(OBJS)\wxemulator.ild del $(OBJS)\wxemulator.ild\r
-       -if exist $(OBJS)\wxemulator.ilf del $(OBJS)\wxemulator.ilf\r
-       -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils\r
-\r
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS)  $(OBJS)\wxemulator_sample.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc\r
-\r
-$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp\r
-       $(CXX) -q -c -P -o$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS =  \
+       $(OBJS)\wxemulator_emulator.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+       -if exist $(OBJS)\wxemulator.tds del $(OBJS)\wxemulator.tds
+       -if exist $(OBJS)\wxemulator.ilc del $(OBJS)\wxemulator.ilc
+       -if exist $(OBJS)\wxemulator.ild del $(OBJS)\wxemulator.ild
+       -if exist $(OBJS)\wxemulator.ilf del $(OBJS)\wxemulator.ilf
+       -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS)  $(OBJS)\wxemulator_sample.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
+       $(CXX) -q -c -P -o$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
+

diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc
index bd500c7c40a318f6468d30ab3b2f50e029577549..0af71c33878ff0853f6fe72842c96a4e0274d7bc 100644 (file)
--- a/utils/emulator/src/makefile.gcc
+++ b/utils/emulator/src/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-WXEMULATOR_OBJECTS =  \\r
-       $(OBJS)\wxemulator_sample_rc.o \\r
-       $(OBJS)\wxemulator_emulator.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxemulator.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
-\r
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o\r
-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\wxemulator_sample_rc.o: ./../../../samples/sample.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-$(OBJS)\wxemulator_emulator.o: ./emulator.cpp\r
-       $(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS =  \
+       $(OBJS)\wxemulator_sample_rc.o \
+       $(OBJS)\wxemulator_emulator.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
+       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\wxemulator_sample_rc.o: ./../../../samples/sample.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+$(OBJS)\wxemulator_emulator.o: ./emulator.cpp
+       $(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc
index 8781a7973c649fe72a19d2a365dd3afab4a8c48a..6a138f2e1e0e514cb5a5884a8f07f89f312332d1 100644 (file)
--- a/utils/emulator/src/makefile.vc
+++ b/utils/emulator/src/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-WXEMULATOR_OBJECTS =  \\r
-       $(OBJS)\wxemulator_sample.res \\r
-       $(OBJS)\wxemulator_emulator.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\wxemulator.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
-       -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk\r
-       -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb\r
-\r
-$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(WXEMULATOR_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc\r
-\r
-$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS =  \
+       $(OBJS)\wxemulator_emulator.obj
+WXEMULATOR_RESOURCES =  \
+       $(OBJS)\wxemulator_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\wxemulator.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+       -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk
+       -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb
+
+$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(WXEMULATOR_OBJECTS) $(WXEMULATOR_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc
+
+$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp
+

diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat
index b9400525098437824dc99d236b8384a36c86227b..334cb41c169e34283e2b21e2f475bb5c898e6718 100644 (file)
--- a/utils/emulator/src/makefile.wat
+++ b/utils/emulator/src/makefile.wat
@@ -1,264 +1,264 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-WXEMULATOR_OBJECTS =  &\r
-       $(OBJS)\wxemulator_emulator.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\wxemulator.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
-\r
-$(OBJS)\wxemulator.exe :  $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res\r
-       @%create $(OBJS)\wxemulator.lbc\r
-       @%append $(OBJS)\wxemulator.lbc option quiet\r
-       @%append $(OBJS)\wxemulator.lbc name $^@\r
-       @%append $(OBJS)\wxemulator.lbc option caseexact\r
-       @%append $(OBJS)\wxemulator.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxemulator.lbc library %i\r
-       @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res\r
-       @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i\r
-       wlink @$(OBJS)\wxemulator.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\wxemulator_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
-$(OBJS)\wxemulator_emulator.obj :  .AUTODEPEND .\emulator.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS =  &
+       $(OBJS)\wxemulator_emulator.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\wxemulator.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
+
+$(OBJS)\wxemulator.exe :  $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res
+       @%create $(OBJS)\wxemulator.lbc
+       @%append $(OBJS)\wxemulator.lbc option quiet
+       @%append $(OBJS)\wxemulator.lbc name $^@
+       @%append $(OBJS)\wxemulator.lbc option caseexact
+       @%append $(OBJS)\wxemulator.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxemulator.lbc library %i
+       @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res
+       @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i
+       wlink @$(OBJS)\wxemulator.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\wxemulator_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
+$(OBJS)\wxemulator_emulator.obj :  .AUTODEPEND .\emulator.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $<
+

diff --git a/utils/execmon/Makefile.in b/utils/execmon/Makefile.in
index eee591b6316ab16528888164b3979bb001ed6280..0d75ebc84019423c3e0840639490c50a98d2a3ad 100644 (file)
--- a/utils/execmon/Makefile.in
+++ b/utils/execmon/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/execmon/execmon.dsp b/utils/execmon/execmon.dsp
index 2e2557debb62ea8e7e3afbc79c3a6e1a0039f2d2..2ea0afc7f3dd6d7e0fedc62ec6841a325ce69f99 100644 (file)
--- a/utils/execmon/execmon.dsp
+++ b/utils/execmon/execmon.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\execmon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\execmon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\execmon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\execmon"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/utils/execmon/execmon_vc7.vcproj b/utils/execmon/execmon_vc7.vcproj
index 4f399216dd2c1e49d1f8d853b3a1b126afe0ed19..1448f20d21f73c8ed98026cf10c1b17b25be02cc 100644 (file)
--- a/utils/execmon/execmon_vc7.vcproj
+++ b/utils/execmon/execmon_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\execmon.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\execmon.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\execmon.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\execmon.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/utils/execmon/execmon_vc8.vcproj b/utils/execmon/execmon_vc8.vcproj
index 5d17100ec9dbd6ac8483acedaf85b4761ac21b4b..44293f0ae28d3a80fab7d6f9aa520d9a8ad2d3d3 100644 (file)
--- a/utils/execmon/execmon_vc8.vcproj
+++ b/utils/execmon/execmon_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/execmon/execmon_vc9.vcproj b/utils/execmon/execmon_vc9.vcproj
index 61b436d284b8541bdbaf0f5de5d7ef8fdc3a0840..bae0404974e04c066abb076e50c17f162c43b523 100644 (file)
--- a/utils/execmon/execmon_vc9.vcproj
+++ b/utils/execmon/execmon_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\execmon.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\execmon.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/execmon/makefile.bcc b/utils/execmon/makefile.bcc
index 809e0b666156274a1505b40f0c102304659f9a09..570065107cf10d9df495e126754c53b85fc13293 100644 (file)
--- a/utils/execmon/makefile.bcc
+++ b/utils/execmon/makefile.bcc
@@ -1,191 +1,191 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-       -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds\r
-       -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc\r
-       -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild\r
-       -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf\r
-       -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
-|\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp\r
-       $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+       -if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds
+       -if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc
+       -if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild
+       -if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf
+       -if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+!endif
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+       $(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+

diff --git a/utils/execmon/makefile.gcc b/utils/execmon/makefile.gcc
index 50503a68b1d52fee16bcb33760aae5ea118d0c03..5088fbd425da9ed87f875447eac1ae892a56cdf7 100644 (file)
--- a/utils/execmon/makefile.gcc
+++ b/utils/execmon/makefile.gcc
@@ -1,184 +1,184 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_XRC),1)\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-\r
-ifeq ($(USE_XRC),1)\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       $(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\execmon_execmon.o: ./execmon.cpp\r
-       $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_XRC),1)
+__execmon___depname = $(OBJS)\execmon.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+
+ifeq ($(USE_XRC),1)
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       $(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\execmon_execmon.o: ./execmon.cpp
+       $(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc
index 5e41f8d5d0115c4eac05c4b32c7edff8c64b37f7..0ecdea310bcade500a59be906fc1478a92647513 100644 (file)
--- a/utils/execmon/makefile.vc
+++ b/utils/execmon/makefile.vc
@@ -1,251 +1,275 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-EXECMON_OBJECTS =  \\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__execmon___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-       -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk\r
-       -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(EXECMON_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj: .\execmon.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+       $(OBJS)\execmon_execmon.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+       -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk
+       -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(EXECMON_OBJECTS)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\execmon_execmon.obj: .\execmon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp
+

diff --git a/utils/execmon/makefile.wat b/utils/execmon/makefile.wat
index 90852b7f7c4eec7946054cdb02c2e5c94b8e6fcd..c77d0c8d12d8afd36c7e169357f2437e70bcc1ca 100644 (file)
--- a/utils/execmon/makefile.wat
+++ b/utils/execmon/makefile.wat
@@ -1,245 +1,245 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__execmon___depname =\r
-!ifeq USE_XRC 1\r
-__execmon___depname = $(OBJS)\execmon.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-EXECMON_OBJECTS =  &\r
-       $(OBJS)\execmon_execmon.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__execmon___depname)\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe\r
-\r
-!ifeq USE_XRC 1\r
-$(OBJS)\execmon.exe :  $(EXECMON_OBJECTS)\r
-       @%create $(OBJS)\execmon.lbc\r
-       @%append $(OBJS)\execmon.lbc option quiet\r
-       @%append $(OBJS)\execmon.lbc name $^@\r
-       @%append $(OBJS)\execmon.lbc option caseexact\r
-       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i\r
-       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\execmon.lbc library %i\r
-       @%append $(OBJS)\execmon.lbc\r
-       @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i\r
-       wlink @$(OBJS)\execmon.lbc\r
-!endif\r
-\r
-$(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__execmon___depname =
+!ifeq USE_XRC 1
+__execmon___depname = $(OBJS)\execmon.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  &
+       $(OBJS)\execmon_execmon.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__execmon___depname)
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe
+
+!ifeq USE_XRC 1
+$(OBJS)\execmon.exe :  $(EXECMON_OBJECTS)
+       @%create $(OBJS)\execmon.lbc
+       @%append $(OBJS)\execmon.lbc option quiet
+       @%append $(OBJS)\execmon.lbc name $^@
+       @%append $(OBJS)\execmon.lbc option caseexact
+       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i
+       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\execmon.lbc library %i
+       @%append $(OBJS)\execmon.lbc
+       @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i
+       wlink @$(OBJS)\execmon.lbc
+!endif
+
+$(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $<
+

diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 5ee5c6c38c210ca4cd419680479ee4082d72a59d..9df2af20eb00f034d16f9080358b5c825f83d77c 100644 (file)
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/helpview/src/helpview.dsp b/utils/helpview/src/helpview.dsp
index 23f7677abb00ac4fd6aca734d7cdb7acb0f283d2..6a25f4996d83bb2350cb8efd691acda8461a8910 100644 (file)
--- a/utils/helpview/src/helpview.dsp
+++ b/utils/helpview/src/helpview.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\helpview"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj
index a6f23c72ff37dc37e9f2c7e92990d359189a57a8..5617e37afa6a6b69963548f48c9d661c3e448dbb 100644 (file)
--- a/utils/helpview/src/helpview_vc7.vcproj
+++ b/utils/helpview/src/helpview_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj
index f75383db3c35cd2ce3ca04eb4a9cc5109a8800fd..89d78001d02caafff1a484a6a6545fe8dd66b92e 100644 (file)
--- a/utils/helpview/src/helpview_vc8.vcproj
+++ b/utils/helpview/src/helpview_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/helpview/src/helpview_vc9.vcproj b/utils/helpview/src/helpview_vc9.vcproj
index b756307d2f3b8273e0690fd907fe5eeee2012443..8120e4cc8b906ade8abe406f3a6886b8d1d5ee08 100644 (file)
--- a/utils/helpview/src/helpview_vc9.vcproj
+++ b/utils/helpview/src/helpview_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\helpview.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\helpview.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc
index 4a4d474d3519878a77ba2aa0c22db6eef7e2fe17..6d024e70a8b8270919480eedda0d966c03e5f37d 100644 (file)
--- a/utils/helpview/src/makefile.bcc
+++ b/utils/helpview/src/makefile.bcc
@@ -1,244 +1,244 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-       -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds\r
-       -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc\r
-       -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild\r
-       -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf\r
-       -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res\r
-|\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
-       $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
-\r
-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+       -if exist $(OBJS)\helpview.tds del $(OBJS)\helpview.tds
+       -if exist $(OBJS)\helpview.ilc del $(OBJS)\helpview.ilc
+       -if exist $(OBJS)\helpview.ild del $(OBJS)\helpview.ild
+       -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf
+       -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+       $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc
+

diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc
index ea532c4f5590d3db0483e5537984dc35b0ce3b03..86a7b130d7932e360dd74c7d183f5c933a456ec2 100644 (file)
--- a/utils/helpview/src/makefile.gcc
+++ b/utils/helpview/src/makefile.gcc
@@ -1,238 +1,238 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.o \\r
-       $(OBJS)\helpview_helpview_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o\r
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.o: ./helpview.cpp\r
-       $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean data\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.o \
+       $(OBJS)\helpview_helpview_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\helpview_helpview.o: ./helpview.cpp
+       $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\helpview_helpview_rc.o: ./helpview.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean data
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc
index f4ad2072de799a48000f606d91323018ee3d5f65..79df8525bdf5f7fd73de913c8305a85b577c8c54 100644 (file)
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -1,323 +1,348 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  \\r
-       $(OBJS)\helpview_helpview.obj \\r
-       $(OBJS)\helpview_helpview.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\helpview.exe data\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-       -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk\r
-       -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb\r
-\r
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HELPVIEW_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
-\r
-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+       $(OBJS)\helpview_helpview.obj
+HELPVIEW_RESOURCES =  \
+       $(OBJS)\helpview_helpview.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\helpview.exe data
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+       -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk
+       -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
+
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj: .\helpview.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
+
+$(OBJS)\helpview_helpview.res: .\helpview.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc
+

diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat
index dab621c187fd520d2a67f2b6f31244956e1cabce..3b83fb7f992e03b6c1711ae36d9354f2e58f0c78 100644 (file)
--- a/utils/helpview/src/makefile.wat
+++ b/utils/helpview/src/makefile.wat
@@ -1,274 +1,274 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-HELPVIEW_OBJECTS =  &\r
-       $(OBJS)\helpview_helpview.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\helpview.exe data\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
-\r
-$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
-       @%create $(OBJS)\helpview.lbc\r
-       @%append $(OBJS)\helpview.lbc option quiet\r
-       @%append $(OBJS)\helpview.lbc name $^@\r
-       @%append $(OBJS)\helpview.lbc option caseexact\r
-       @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i\r
-       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res\r
-       @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i\r
-       wlink @$(OBJS)\helpview.lbc\r
-\r
-data : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<\r
-\r
-$(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  &
+       $(OBJS)\helpview_helpview.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\helpview.exe data
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
+
+$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+       @%create $(OBJS)\helpview.lbc
+       @%append $(OBJS)\helpview.lbc option quiet
+       @%append $(OBJS)\helpview.lbc name $^@
+       @%append $(OBJS)\helpview.lbc option caseexact
+       @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i
+       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
+       @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i
+       wlink @$(OBJS)\helpview.lbc
+
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<
+
+$(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in
index 1f132d42ad4e9768bd163ca7a76205bc1adab57f..7c23b9779ac63a616ab7d2e6dfecccf042891b9a 100644 (file)
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/hhp2cached/hhp2cached.dsp b/utils/hhp2cached/hhp2cached.dsp
index 99c666afac1606371e375cfbdab9d2df7144d6be..36bf3c07e991c9611bc4508184e7fe93c08ce55d 100644 (file)
--- a/utils/hhp2cached/hhp2cached.dsp
+++ b/utils/hhp2cached/hhp2cached.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\hhp2cached"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\hhp2cached"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\hhp2cached"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\hhp2cached"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r

diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj
index 023ff952b7ce0f6d21ca515cce684e2e84a9e53d..f4a067ab7d4ac308a2b20018c84a6dde51413368 100644 (file)
--- a/utils/hhp2cached/hhp2cached_vc7.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj
index 38ea875add8e40c5afc96d6e836dc56f61106626..c72172424e6f7b8e5815a043ea596860022ea7fc 100644 (file)
--- a/utils/hhp2cached/hhp2cached_vc8.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/hhp2cached/hhp2cached_vc9.vcproj b/utils/hhp2cached/hhp2cached_vc9.vcproj
index 6853d088b97be5504be6e27343ea82bf9cfc51fd..c96e92361d43ab8b4895b4104f272d8cbd3a9a25 100644 (file)
--- a/utils/hhp2cached/hhp2cached_vc9.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\hhp2cached.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc
index db20fb07f46f45347ce4146203007df60289fb4f..14c53c78e5c94a27b5ee73796803b1f8d2ce821f 100644 (file)
--- a/utils/hhp2cached/makefile.bcc
+++ b/utils/hhp2cached/makefile.bcc
@@ -1,236 +1,236 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HHP2CACHED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-HHP2CACHED_OBJECTS =  \\r
-       $(OBJS)\hhp2cached_hhp2cached.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\hhp2cached.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe\r
-       -if exist $(OBJS)\hhp2cached.tds del $(OBJS)\hhp2cached.tds\r
-       -if exist $(OBJS)\hhp2cached.ilc del $(OBJS)\hhp2cached.ilc\r
-       -if exist $(OBJS)\hhp2cached.ild del $(OBJS)\hhp2cached.ild\r
-       -if exist $(OBJS)\hhp2cached.ilf del $(OBJS)\hhp2cached.ilf\r
-       -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils\r
-\r
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS)  $(OBJS)\hhp2cached_hhp2cached.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res\r
-|\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp\r
-       $(CXX) -q -c -P -o$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\hhp2cached.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS =  \
+       $(OBJS)\hhp2cached_hhp2cached.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+       -if exist $(OBJS)\hhp2cached.tds del $(OBJS)\hhp2cached.tds
+       -if exist $(OBJS)\hhp2cached.ilc del $(OBJS)\hhp2cached.ilc
+       -if exist $(OBJS)\hhp2cached.ild del $(OBJS)\hhp2cached.ild
+       -if exist $(OBJS)\hhp2cached.ilf del $(OBJS)\hhp2cached.ilf
+       -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS)  $(OBJS)\hhp2cached_hhp2cached.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
+|
+
+$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
+       $(CXX) -q -c -P -o$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
+
+$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\hhp2cached.rc
+

diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc
index 2d2eb6981d5ee0230df3b5cef8def7605ca949fe..e31c7b34d3615e15a932c334415735452d97ea87 100644 (file)
--- a/utils/hhp2cached/makefile.gcc
+++ b/utils/hhp2cached/makefile.gcc
@@ -1,230 +1,230 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HHP2CACHED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-HHP2CACHED_OBJECTS =  \\r
-       $(OBJS)\hhp2cached_hhp2cached.o \\r
-       $(OBJS)\hhp2cached_hhp2cached_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\hhp2cached.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe\r
-\r
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o\r
-       $(CXX) -o $@ $(HHP2CACHED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp\r
-       $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\hhp2cached_hhp2cached_rc.o: ./hhp2cached.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS =  \
+       $(OBJS)\hhp2cached_hhp2cached.o \
+       $(OBJS)\hhp2cached_hhp2cached_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
+       $(CXX) -o $@ $(HHP2CACHED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
+       $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\hhp2cached_hhp2cached_rc.o: ./hhp2cached.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc
index 89164d2ecac9795a441cf659e9cbdc44842f0c2e..862a26271a1fc2fb35b317a8d6a539506ef5ff75 100644 (file)
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -1,315 +1,340 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-HHP2CACHED_OBJECTS =  \\r
-       $(OBJS)\hhp2cached_hhp2cached.obj \\r
-       $(OBJS)\hhp2cached_hhp2cached.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\hhp2cached.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe\r
-       -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk\r
-       -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb\r
-\r
-$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(HHP2CACHED_OBJECTS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS =  \
+       $(OBJS)\hhp2cached_hhp2cached.obj
+HHP2CACHED_RESOURCES =  \
+       $(OBJS)\hhp2cached_hhp2cached.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\hhp2cached.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+       -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk
+       -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb
+
+$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(HHP2CACHED_OBJECTS) $(HHP2CACHED_RESOURCES)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp
+
+$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc
+

diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat
index 95b53a4462e017166b966b88b0ab822c002d2bd6..f81dd3ec3dd5af82da5a259b558dae43fa0af8d5 100644 (file)
--- a/utils/hhp2cached/makefile.wat
+++ b/utils/hhp2cached/makefile.wat
@@ -1,265 +1,265 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
-HHP2CACHED_OBJECTS =  &\r
-       $(OBJS)\hhp2cached_hhp2cached.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\hhp2cached.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe\r
-\r
-$(OBJS)\hhp2cached.exe :  $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res\r
-       @%create $(OBJS)\hhp2cached.lbc\r
-       @%append $(OBJS)\hhp2cached.lbc option quiet\r
-       @%append $(OBJS)\hhp2cached.lbc name $^@\r
-       @%append $(OBJS)\hhp2cached.lbc option caseexact\r
-       @%append $(OBJS)\hhp2cached.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i\r
-       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\hhp2cached.lbc library %i\r
-       @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res\r
-       @for %i in () do @%append $(OBJS)\hhp2cached.lbc option stack=%i\r
-       wlink @$(OBJS)\hhp2cached.lbc\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.obj :  .AUTODEPEND .\hhp2cached.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $<\r
-\r
-$(OBJS)\hhp2cached_hhp2cached.res :  .AUTODEPEND .\hhp2cached.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+       $(CXXFLAGS)
+HHP2CACHED_OBJECTS =  &
+       $(OBJS)\hhp2cached_hhp2cached.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\hhp2cached.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
+
+$(OBJS)\hhp2cached.exe :  $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res
+       @%create $(OBJS)\hhp2cached.lbc
+       @%append $(OBJS)\hhp2cached.lbc option quiet
+       @%append $(OBJS)\hhp2cached.lbc name $^@
+       @%append $(OBJS)\hhp2cached.lbc option caseexact
+       @%append $(OBJS)\hhp2cached.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\hhp2cached.lbc library %i
+       @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res
+       @for %i in () do @%append $(OBJS)\hhp2cached.lbc option stack=%i
+       wlink @$(OBJS)\hhp2cached.lbc
+
+$(OBJS)\hhp2cached_hhp2cached.obj :  .AUTODEPEND .\hhp2cached.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $<
+
+$(OBJS)\hhp2cached_hhp2cached.res :  .AUTODEPEND .\hhp2cached.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in
index 02a47389e68595a5ab2cb2f408e50934c3107c6e..399b12137fd2a95d84a750f65092579912503aad 100644 (file)
--- a/utils/ifacecheck/src/Makefile.in
+++ b/utils/ifacecheck/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/ifacecheck/src/ifacecheck.dsp b/utils/ifacecheck/src/ifacecheck.dsp
index 85290ae7d36779349be0a7056474f2993c829a1d..2008857c8e784b57fca19e0385d217cd5f4dafe2 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck.dsp
+++ b/utils/ifacecheck/src/ifacecheck.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\ifacecheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\ifacecheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\ifacecheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\ifacecheck"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj
index 56f88cae0864e962f763e1ed301aadde246eeb6a..0e7326095872ab8f969c55c5c047f2af5b26ee90 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
index e3a6ea00da2213b6de11ee0fe69626e5da912c31..1ca1d5858ad2682476906385b1b1074384d4661a 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/ifacecheck/src/ifacecheck_vc9.vcproj b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
index fc778702ab4bf8b71ebfec8a56f61b8af90070bd..831d935db50d955711144a534d9fdb6765d30f7e 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck_vc9.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\ifacecheck.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc
index 903eadfb5a92d01ff6d01c2da309f1d162987d75..4051bec7ba9e4912371fd1602656c833b227d44f 100644 (file)
--- a/utils/ifacecheck/src/makefile.bcc
+++ b/utils/ifacecheck/src/makefile.bcc
@@ -1,194 +1,194 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IFACECHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-IFACECHECK_OBJECTS =  \\r
-       $(OBJS)\ifacecheck_ifacecheck.obj \\r
-       $(OBJS)\ifacecheck_xmlparser.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ifacecheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe\r
-       -if exist $(OBJS)\ifacecheck.tds del $(OBJS)\ifacecheck.tds\r
-       -if exist $(OBJS)\ifacecheck.ilc del $(OBJS)\ifacecheck.ilc\r
-       -if exist $(OBJS)\ifacecheck.ild del $(OBJS)\ifacecheck.ild\r
-       -if exist $(OBJS)\ifacecheck.ilf del $(OBJS)\ifacecheck.ilf\r
-       -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils\r
-\r
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
-|\r
-\r
-$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp\r
-       $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp\r
-\r
-$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp\r
-       $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS =  \
+       $(OBJS)\ifacecheck_ifacecheck.obj \
+       $(OBJS)\ifacecheck_xmlparser.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+       -if exist $(OBJS)\ifacecheck.tds del $(OBJS)\ifacecheck.tds
+       -if exist $(OBJS)\ifacecheck.ilc del $(OBJS)\ifacecheck.ilc
+       -if exist $(OBJS)\ifacecheck.ild del $(OBJS)\ifacecheck.ild
+       -if exist $(OBJS)\ifacecheck.ilf del $(OBJS)\ifacecheck.ilf
+       -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+
+$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
+       $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
+
+$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
+       $(CXX) -q -c -P -o$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
+

diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc
index e63366f662c514804d04437d6e2ed1a17cc8ef26..8d963430dd6a801f01fc64995b343abada512c26 100644 (file)
--- a/utils/ifacecheck/src/makefile.gcc
+++ b/utils/ifacecheck/src/makefile.gcc
@@ -1,187 +1,187 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IFACECHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-IFACECHECK_OBJECTS =  \\r
-       $(OBJS)\ifacecheck_ifacecheck.o \\r
-       $(OBJS)\ifacecheck_xmlparser.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ifacecheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe\r
-\r
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)\r
-       $(CXX) -o $@ $(IFACECHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-$(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp\r
-       $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\ifacecheck_xmlparser.o: ./xmlparser.cpp\r
-       $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS =  \
+       $(OBJS)\ifacecheck_ifacecheck.o \
+       $(OBJS)\ifacecheck_xmlparser.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+       $(CXX) -o $@ $(IFACECHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
+       $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ifacecheck_xmlparser.o: ./xmlparser.cpp
+       $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc
index 0a5a6b36f0c4db9d8aef661c957e01efa1df241f..5339ff08f274c454db7142b7342b1d4ebf9ab078 100644 (file)
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -1,254 +1,278 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-IFACECHECK_OBJECTS =  \\r
-       $(OBJS)\ifacecheck_ifacecheck.obj \\r
-       $(OBJS)\ifacecheck_xmlparser.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\ifacecheck.exe\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe\r
-       -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk\r
-       -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb\r
-\r
-$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(IFACECHECK_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp\r
-\r
-$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS =  \
+       $(OBJS)\ifacecheck_ifacecheck.obj \
+       $(OBJS)\ifacecheck_xmlparser.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\ifacecheck.exe
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+       -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk
+       -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb
+
+$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(IFACECHECK_OBJECTS)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp
+
+$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp
+

diff --git a/utils/ifacecheck/src/makefile.wat b/utils/ifacecheck/src/makefile.wat
index a343e3ef25a85fac928296e099ea4dd8606fa6a8..82273d5722806afa09108845ec783fafdecd7928 100644 (file)
--- a/utils/ifacecheck/src/makefile.wat
+++ b/utils/ifacecheck/src/makefile.wat
@@ -1,249 +1,249 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-IFACECHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
-       $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) &\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
-IFACECHECK_OBJECTS =  &\r
-       $(OBJS)\ifacecheck_ifacecheck.obj &\r
-       $(OBJS)\ifacecheck_xmlparser.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\ifacecheck.exe\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe\r
-\r
-$(OBJS)\ifacecheck.exe :  $(IFACECHECK_OBJECTS)\r
-       @%create $(OBJS)\ifacecheck.lbc\r
-       @%append $(OBJS)\ifacecheck.lbc option quiet\r
-       @%append $(OBJS)\ifacecheck.lbc name $^@\r
-       @%append $(OBJS)\ifacecheck.lbc option caseexact\r
-       @%append $(OBJS)\ifacecheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i\r
-       @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ifacecheck.lbc library %i\r
-       @%append $(OBJS)\ifacecheck.lbc\r
-       @for %i in () do @%append $(OBJS)\ifacecheck.lbc option stack=%i\r
-       wlink @$(OBJS)\ifacecheck.lbc\r
-\r
-$(OBJS)\ifacecheck_ifacecheck.obj :  .AUTODEPEND .\ifacecheck.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $<\r
-\r
-$(OBJS)\ifacecheck_xmlparser.obj :  .AUTODEPEND .\xmlparser.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+IFACECHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) &
+       $(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS =  &
+       $(OBJS)\ifacecheck_ifacecheck.obj &
+       $(OBJS)\ifacecheck_xmlparser.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\ifacecheck.exe
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
+
+$(OBJS)\ifacecheck.exe :  $(IFACECHECK_OBJECTS)
+       @%create $(OBJS)\ifacecheck.lbc
+       @%append $(OBJS)\ifacecheck.lbc option quiet
+       @%append $(OBJS)\ifacecheck.lbc name $^@
+       @%append $(OBJS)\ifacecheck.lbc option caseexact
+       @%append $(OBJS)\ifacecheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i
+       @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ifacecheck.lbc library %i
+       @%append $(OBJS)\ifacecheck.lbc
+       @for %i in () do @%append $(OBJS)\ifacecheck.lbc option stack=%i
+       wlink @$(OBJS)\ifacecheck.lbc
+
+$(OBJS)\ifacecheck_ifacecheck.obj :  .AUTODEPEND .\ifacecheck.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $<
+
+$(OBJS)\ifacecheck_xmlparser.obj :  .AUTODEPEND .\xmlparser.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $<
+

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 26c00bb0dbf615a87de641937d0aeb2b946017a6..4490090fb3a304cdda14c2e86db11badfa7109d3 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,123 +1,123 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \\r
-       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \\r
-       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \\r
-       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \\r
-       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \\r
-       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \\r
-       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \\r
-       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \\r
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
-       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
-       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
-       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.csm del .\*.csm\r
-       @echo cd emulator\src >emulator.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat\r
-       call emulator.bat\r
-       @del emulator.bat\r
-       @echo cd execmon >execmon.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat\r
-       call execmon.bat\r
-       @del execmon.bat\r
-       @echo cd helpview\src >helpview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat\r
-       call helpview.bat\r
-       @del helpview.bat\r
-       @echo cd hhp2cached >hhp2cached.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat\r
-       call hhp2cached.bat\r
-       @del hhp2cached.bat\r
-       @echo cd ifacecheck\src >ifacecheck.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat\r
-       call ifacecheck.bat\r
-       @del ifacecheck.bat\r
-       @echo cd screenshotgen\src >screenshotgen.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat\r
-       call screenshotgen.bat\r
-       @del screenshotgen.bat\r
-       @echo cd wxrc >wxrc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat\r
-       call wxrc.bat\r
-       @del wxrc.bat\r
-\r
-emulator: \r
-       @echo cd emulator\src >emulator.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat\r
-       call emulator.bat\r
-       @del emulator.bat\r
-\r
-execmon: \r
-       @echo cd execmon >execmon.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat\r
-       call execmon.bat\r
-       @del execmon.bat\r
-\r
-helpview: \r
-       @echo cd helpview\src >helpview.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat\r
-       call helpview.bat\r
-       @del helpview.bat\r
-\r
-hhp2cached: \r
-       @echo cd hhp2cached >hhp2cached.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat\r
-       call hhp2cached.bat\r
-       @del hhp2cached.bat\r
-\r
-ifacecheck: \r
-       @echo cd ifacecheck\src >ifacecheck.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat\r
-       call ifacecheck.bat\r
-       @del ifacecheck.bat\r
-\r
-screenshotgen: \r
-       @echo cd screenshotgen\src >screenshotgen.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat\r
-       call screenshotgen.bat\r
-       @del screenshotgen.bat\r
-\r
-wxrc: \r
-       @echo cd wxrc >wxrc.bat\r
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat\r
-       call wxrc.bat\r
-       @del wxrc.bat\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+       -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+       -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
+       -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.csm del .\*.csm
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
+       call emulator.bat
+       @del emulator.bat
+       @echo cd execmon >execmon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat
+       call execmon.bat
+       @del execmon.bat
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+       @echo cd hhp2cached >hhp2cached.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat
+       call hhp2cached.bat
+       @del hhp2cached.bat
+       @echo cd ifacecheck\src >ifacecheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat
+       call ifacecheck.bat
+       @del ifacecheck.bat
+       @echo cd screenshotgen\src >screenshotgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat
+       call screenshotgen.bat
+       @del screenshotgen.bat
+       @echo cd wxrc >wxrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat
+       call wxrc.bat
+       @del wxrc.bat
+
+emulator: 
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat
+       call emulator.bat
+       @del emulator.bat
+
+execmon: 
+       @echo cd execmon >execmon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat
+       call execmon.bat
+       @del execmon.bat
+
+helpview: 
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+
+hhp2cached: 
+       @echo cd hhp2cached >hhp2cached.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat
+       call hhp2cached.bat
+       @del hhp2cached.bat
+
+ifacecheck: 
+       @echo cd ifacecheck\src >ifacecheck.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat
+       call ifacecheck.bat
+       @del ifacecheck.bat
+
+screenshotgen: 
+       @echo cd screenshotgen\src >screenshotgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat
+       call screenshotgen.bat
+       @del screenshotgen.bat
+
+wxrc: 
+       @echo cd wxrc >wxrc.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat
+       call wxrc.bat
+       @del wxrc.bat
+

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 0bad2e09b3f9300555152c73f7b40d5825c4236e..bd36d90dcfad6f6a5aa6cd9a1285403e8779101c 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,80 +1,80 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
-       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
-       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
-       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc\r
-\r
-clean: \r
-       -if exist .\*.o del .\*.o\r
-       -if exist .\*.d del .\*.d\r
-       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean\r
-       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean\r
-\r
-emulator: \r
-       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all\r
-\r
-execmon: \r
-       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all\r
-\r
-helpview: \r
-       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all\r
-\r
-hhp2cached: \r
-       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all\r
-\r
-ifacecheck: \r
-       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all\r
-\r
-screenshotgen: \r
-       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all\r
-\r
-wxrc: \r
-       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all\r
-\r
-.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \\r
-       wxrc\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include ./*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+clean: 
+       -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean
+
+emulator: 
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
+
+execmon: 
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all
+
+helpview: 
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
+
+hhp2cached: 
+       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all
+
+ifacecheck: 
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
+
+screenshotgen: 
+       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all
+
+wxrc: 
+       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \
+       wxrc
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d

diff --git a/utils/makefile.vc b/utils/makefile.vc
index caf069e89deef363ce5431e1561cf44fe9523236..28fa38a18a7c16bc721a46bcddd1258949b2d084 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,100 +1,100 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
-       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
-       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-\r
-### Targets: ###\r
-\r
-all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc\r
-\r
-clean: \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.pch del .\*.pch\r
-       cd emulator\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd execmon\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd helpview\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd hhp2cached\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd ifacecheck\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd screenshotgen\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-       cd wxrc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_emulator: \r
-       cd emulator\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_execmon: \r
-       cd execmon\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_helpview: \r
-       cd helpview\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_hhp2cached: \r
-       cd hhp2cached\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_ifacecheck: \r
-       cd ifacecheck\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_screenshotgen: \r
-       cd screenshotgen\src\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
-sub_wxrc: \r
-       cd wxrc\r
-       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
-       cd "$(MAKEDIR)"\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+### Conditionally set variables: ###
+
+
+
+### Targets: ###
+
+all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd emulator\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd execmon
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd helpview\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd hhp2cached
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd ifacecheck\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd screenshotgen\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+       cd wxrc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
+
+sub_emulator: 
+       cd emulator\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_execmon: 
+       cd execmon
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_helpview: 
+       cd helpview\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_hhp2cached: 
+       cd hhp2cached
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_ifacecheck: 
+       cd ifacecheck\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_screenshotgen: 
+       cd screenshotgen\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
+sub_wxrc: 
+       cd wxrc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+

diff --git a/utils/makefile.wat b/utils/makefile.wat
index abc4a3dead0597e051d7403c4c145cb429f84e8c..421980d2823c2cb4b6843bb77c64e089212c9f83 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,120 +1,120 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-\r
-### Variables: ###\r
-\r
-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &\r
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &\r
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &\r
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &\r
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &\r
-       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &\r
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &\r
-       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &\r
-       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
-       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
-\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc\r
-\r
-clean : .SYMBOLIC \r
-       -if exist .\*.obj del .\*.obj\r
-       -if exist .\*.res del .\*.res\r
-       -if exist .\*.lbc del .\*.lbc\r
-       -if exist .\*.ilk del .\*.ilk\r
-       -if exist .\*.pch del .\*.pch\r
-       cd emulator\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd execmon\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd helpview\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd hhp2cached\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd ifacecheck\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd screenshotgen\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-       cd wxrc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean\r
-       cd $(WATCOM_CWD)\r
-\r
-emulator : .SYMBOLIC \r
-       cd emulator\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-execmon : .SYMBOLIC \r
-       cd execmon\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-helpview : .SYMBOLIC \r
-       cd helpview\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-hhp2cached : .SYMBOLIC \r
-       cd hhp2cached\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-ifacecheck : .SYMBOLIC \r
-       cd ifacecheck\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-screenshotgen : .SYMBOLIC \r
-       cd screenshotgen\src\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
-wxrc : .SYMBOLIC \r
-       cd wxrc\r
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all\r
-       cd $(WATCOM_CWD)\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"
+
+
+### Targets: ###
+
+all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+clean : .SYMBOLIC 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       -if exist .\*.lbc del .\*.lbc
+       -if exist .\*.ilk del .\*.ilk
+       -if exist .\*.pch del .\*.pch
+       cd emulator\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd helpview\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd hhp2cached
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd ifacecheck\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd screenshotgen\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+       cd wxrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
+
+emulator : .SYMBOLIC 
+       cd emulator\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+execmon : .SYMBOLIC 
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+helpview : .SYMBOLIC 
+       cd helpview\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+hhp2cached : .SYMBOLIC 
+       cd hhp2cached
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+ifacecheck : .SYMBOLIC 
+       cd ifacecheck\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+screenshotgen : .SYMBOLIC 
+       cd screenshotgen\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+wxrc : .SYMBOLIC 
+       cd wxrc
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+

diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index b43680d99704e1e11eed911684e4a9787b0f3332..091cff985c0255d90ef6958f3f5e8671dd8305ed 100644 (file)
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index 207e9c31d3ce8e0052d2c2a89e82dfe81c3e261a..9652c84124ca0463207d3df2c877a85ad92568ec 100644 (file)
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -1,276 +1,276 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \\r
-       $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \\r
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \\r
-       -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-SCREENSHOTGEN_OBJECTS =  \\r
-       $(OBJS)\screenshotgen_screenshot_app.obj \\r
-       $(OBJS)\screenshotgen_screenshot_main.obj \\r
-       $(OBJS)\screenshotgen_guiframe.obj \\r
-       $(OBJS)\screenshotgen_customcombo.obj \\r
-       $(OBJS)\screenshotgen_autocapture.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = -d_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = -dWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_AUI_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RICHTEXT_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\screenshotgen.exe bitmaps xml\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe\r
-       -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds\r
-       -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc\r
-       -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild\r
-       -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf\r
-       -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils\r
-\r
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS)  $(OBJS)\screenshotgen_screenshotgen.res\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|\r
-       c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res\r
-|\r
-\r
-bitmaps: \r
-       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps\r
-       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps\r
-\r
-xml: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp\r
-\r
-$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp\r
-\r
-$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp\r
-\r
-$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp\r
-\r
-$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp\r
-       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp\r
-\r
-$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\screenshotgen.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \
+       -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS =  \
+       $(OBJS)\screenshotgen_screenshot_app.obj \
+       $(OBJS)\screenshotgen_screenshot_main.obj \
+       $(OBJS)\screenshotgen_guiframe.obj \
+       $(OBJS)\screenshotgen_customcombo.obj \
+       $(OBJS)\screenshotgen_autocapture.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+       -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds
+       -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc
+       -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild
+       -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf
+       -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS)  $(OBJS)\screenshotgen_screenshotgen.res
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
+       c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
+|
+
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
+       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
+
+$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
+       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
+
+$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
+       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
+
+$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
+       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
+
+$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
+       $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
+
+$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\screenshotgen.rc
+

diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index ca618d571b92d4d7f81b7463cacce69476f0acaf..0ec62be655e3a00a65401116b47373dcc7e62555 100644 (file)
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -1,270 +1,270 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
-SCREENSHOTGEN_OBJECTS =  \\r
-       $(OBJS)\screenshotgen_screenshot_app.o \\r
-       $(OBJS)\screenshotgen_screenshot_main.o \\r
-       $(OBJS)\screenshotgen_guiframe.o \\r
-       $(OBJS)\screenshotgen_customcombo.o \\r
-       $(OBJS)\screenshotgen_autocapture.o \\r
-       $(OBJS)\screenshotgen_screenshotgen_rc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p_1 = --define _UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p_1 = --define WXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_AUI_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_ADV_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_RICHTEXT_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_HTML_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_CORE_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\screenshotgen.exe bitmaps xml\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe\r
-\r
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o\r
-       $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-\r
-bitmaps: \r
-       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps\r
-       for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps\r
-\r
-xml: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
-\r
-$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp\r
-       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp\r
-       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp\r
-       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp\r
-       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp\r
-       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH\r
-\r
-.PHONY: all clean bitmaps xml\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS =  \
+       $(OBJS)\screenshotgen_screenshot_app.o \
+       $(OBJS)\screenshotgen_screenshot_main.o \
+       $(OBJS)\screenshotgen_guiframe.o \
+       $(OBJS)\screenshotgen_customcombo.o \
+       $(OBJS)\screenshotgen_autocapture.o \
+       $(OBJS)\screenshotgen_screenshotgen_rc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_AUI_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_RICHTEXT_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o
+       $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
+
+xml: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
+       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp
+       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp
+       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp
+       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp
+       $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
+.PHONY: all clean bitmaps xml
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index c6a2767ba7a22fedba343e9423d0398e03f7299d..3f46150dbbff8a04c4b6ad34a9543b99c1229d9d 100644 (file)
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -1,355 +1,380 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \\r
-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \\r
-       $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)\r
-SCREENSHOTGEN_OBJECTS =  \\r
-       $(OBJS)\screenshotgen_screenshot_app.obj \\r
-       $(OBJS)\screenshotgen_screenshot_main.obj \\r
-       $(OBJS)\screenshotgen_guiframe.obj \\r
-       $(OBJS)\screenshotgen_customcombo.obj \\r
-       $(OBJS)\screenshotgen_autocapture.obj \\r
-       $(OBJS)\screenshotgen_screenshotgen.res\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p_1 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p_1 = /d _UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p_1 = /d WXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_AUI_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_ADV_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_RICHTEXT_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_HTML_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_CORE_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(OBJS)\screenshotgen.exe bitmaps xml\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe\r
-       -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk\r
-       -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb\r
-\r
-$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<\r
-       $(SCREENSHOTGEN_OBJECTS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-\r
-bitmaps: \r
-       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps\r
-       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps\r
-\r
-xml: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp\r
-\r
-$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp\r
-\r
-$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp\r
-\r
-$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp\r
-\r
-$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp\r
-\r
-$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \
+       $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS =  \
+       $(OBJS)\screenshotgen_screenshot_app.obj \
+       $(OBJS)\screenshotgen_screenshot_main.obj \
+       $(OBJS)\screenshotgen_guiframe.obj \
+       $(OBJS)\screenshotgen_customcombo.obj \
+       $(OBJS)\screenshotgen_autocapture.obj
+SCREENSHOTGEN_RESOURCES =  \
+       $(OBJS)\screenshotgen_screenshotgen.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_RICHTEXT_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+       -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk
+       -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb
+
+$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
+       $(SCREENSHOTGEN_OBJECTS) $(SCREENSHOTGEN_RESOURCES)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+bitmaps: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
+
+$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp
+
+$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp
+
+$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp
+
+$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp
+
+$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc
+

diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat
index 26222e1f51ec1301fb61552b8417a4993103d213..74a56750880cfe48da32fbe4f6b7c747e2286a65 100644 (file)
--- a/utils/screenshotgen/src/makefile.wat
+++ b/utils/screenshotgen/src/makefile.wat
@@ -1,309 +1,309 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXLIB_AUI_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_AUI_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
-!endif\r
-__WXLIB_ADV_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_ADV_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
-!endif\r
-__WXLIB_RICHTEXT_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_RICHTEXT_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
-!endif\r
-__WXLIB_HTML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_HTML_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_CORE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_CORE_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__LIB_TIFF_p =\r
-!ifeq USE_GUI 1\r
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_JPEG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
-!endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) &\r
-       $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &\r
-       -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-SCREENSHOTGEN_OBJECTS =  &\r
-       $(OBJS)\screenshotgen_screenshot_app.obj &\r
-       $(OBJS)\screenshotgen_screenshot_main.obj &\r
-       $(OBJS)\screenshotgen_guiframe.obj &\r
-       $(OBJS)\screenshotgen_customcombo.obj &\r
-       $(OBJS)\screenshotgen_autocapture.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(OBJS)\screenshotgen.exe bitmaps xml\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe\r
-\r
-$(OBJS)\screenshotgen.exe :  $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res\r
-       @%create $(OBJS)\screenshotgen.lbc\r
-       @%append $(OBJS)\screenshotgen.lbc option quiet\r
-       @%append $(OBJS)\screenshotgen.lbc name $^@\r
-       @%append $(OBJS)\screenshotgen.lbc option caseexact\r
-       @%append $(OBJS)\screenshotgen.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
-       @for %i in ($(SCREENSHOTGEN_OBJECTS)) do @%append $(OBJS)\screenshotgen.lbc file %i\r
-       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\screenshotgen.lbc library %i\r
-       @%append $(OBJS)\screenshotgen.lbc option resource=$(OBJS)\screenshotgen_screenshotgen.res\r
-       @for %i in () do @%append $(OBJS)\screenshotgen.lbc option stack=%i\r
-       wlink @$(OBJS)\screenshotgen.lbc\r
-\r
-bitmaps : .SYMBOLIC \r
-       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps\r
-       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps\r
-\r
-xml : .SYMBOLIC \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
-$(OBJS)\screenshotgen_screenshot_app.obj :  .AUTODEPEND .\screenshot_app.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<\r
-\r
-$(OBJS)\screenshotgen_screenshot_main.obj :  .AUTODEPEND .\screenshot_main.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<\r
-\r
-$(OBJS)\screenshotgen_guiframe.obj :  .AUTODEPEND .\guiframe.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<\r
-\r
-$(OBJS)\screenshotgen_customcombo.obj :  .AUTODEPEND .\customcombo.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<\r
-\r
-$(OBJS)\screenshotgen_autocapture.obj :  .AUTODEPEND .\autocapture.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<\r
-\r
-$(OBJS)\screenshotgen_screenshotgen.res :  .AUTODEPEND .\screenshotgen.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_AUI_p =
+!ifeq MONOLITHIC 0
+__WXLIB_AUI_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_RICHTEXT_p =
+!ifeq MONOLITHIC 0
+__WXLIB_RICHTEXT_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) &
+       $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
+       -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &
+       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS =  &
+       $(OBJS)\screenshotgen_screenshot_app.obj &
+       $(OBJS)\screenshotgen_screenshot_main.obj &
+       $(OBJS)\screenshotgen_guiframe.obj &
+       $(OBJS)\screenshotgen_customcombo.obj &
+       $(OBJS)\screenshotgen_autocapture.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\screenshotgen.exe bitmaps xml
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
+
+$(OBJS)\screenshotgen.exe :  $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res
+       @%create $(OBJS)\screenshotgen.lbc
+       @%append $(OBJS)\screenshotgen.lbc option quiet
+       @%append $(OBJS)\screenshotgen.lbc name $^@
+       @%append $(OBJS)\screenshotgen.lbc option caseexact
+       @%append $(OBJS)\screenshotgen.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
+       @for %i in ($(SCREENSHOTGEN_OBJECTS)) do @%append $(OBJS)\screenshotgen.lbc file %i
+       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\screenshotgen.lbc library %i
+       @%append $(OBJS)\screenshotgen.lbc option resource=$(OBJS)\screenshotgen_screenshotgen.res
+       @for %i in () do @%append $(OBJS)\screenshotgen.lbc option stack=%i
+       wlink @$(OBJS)\screenshotgen.lbc
+
+bitmaps : .SYMBOLIC 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
+xml : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\screenshotgen_screenshot_app.obj :  .AUTODEPEND .\screenshot_app.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
+
+$(OBJS)\screenshotgen_screenshot_main.obj :  .AUTODEPEND .\screenshot_main.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
+
+$(OBJS)\screenshotgen_guiframe.obj :  .AUTODEPEND .\guiframe.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
+
+$(OBJS)\screenshotgen_customcombo.obj :  .AUTODEPEND .\customcombo.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
+
+$(OBJS)\screenshotgen_autocapture.obj :  .AUTODEPEND .\autocapture.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
+
+$(OBJS)\screenshotgen_screenshotgen.res :  .AUTODEPEND .\screenshotgen.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+

diff --git a/utils/screenshotgen/src/screenshotgen.dsp b/utils/screenshotgen/src/screenshotgen.dsp
index 923d3b8ce74dddc19c84c2ba8c9cd7fdc4192911..e94e2a96636877efe7da1b9837f6d3b9dc3ea9b5 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen.dsp
+++ b/utils/screenshotgen/src/screenshotgen.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\screenshotgen"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\screenshotgen"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -147,8 +147,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\screenshotgen"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r
@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\screenshotgen"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH\r

diff --git a/utils/screenshotgen/src/screenshotgen_vc7.vcproj b/utils/screenshotgen/src/screenshotgen_vc7.vcproj
index 084adea089a18d3b7a25234d03bbfc3f1527e7df..8ebb764bfa0fef5b91af2387a13dc3ac34635faa 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen_vc7.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\screenshotgen.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\screenshotgen.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

diff --git a/utils/screenshotgen/src/screenshotgen_vc8.vcproj b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
index 0dfd59fd57d2ebe2b7dc46302fa935cefbe49584..10da2d1c5cfb8353234ae4585c095fd8e2f8737c 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen_vc8.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/screenshotgen/src/screenshotgen_vc9.vcproj b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
index e0f8da8e7e9e85597a48849ab123ba9c7855b55c..a559a134d77660bc3eeb49719d689b541b424645 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen_vc9.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_aui.lib  wxmsw29u_adv.lib  wxmsw29u_richtext.lib  wxmsw29u_html.lib  wxbase29u_xml.lib  wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
                                AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_aui.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_richtext.lib  wxmswuniv29u_html.lib  wxbase29u_xml.lib  wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\screenshotgen.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\screenshotgen.pdb"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 0786ecb911b03a45795c4dd6d85b0bad6139bde5..7072fe6abd2e0ca3798ce4ae639eddc20ff2a77a 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.6 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index 86f40d99eceefb83c6161046c8822b7c0442a050..de3e85e921f88a8644f730f8236b52095805a8c2 100644 (file)
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -1,195 +1,195 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-.autodepend\r
-\r
-!ifndef BCCDIR\r
-!ifndef MAKEDIR\r
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4\r
-!endif\r
-BCCDIR = $(MAKEDIR)\..\r
-!endif\r
-\r
-!include ../../build/msw/config.bcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = bcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXRC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
-WXRC_OBJECTS =  \\r
-       $(OBJS)\wxrc_wxrc.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__wxrc___depname = $(OBJS)\wxrc.exe\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO = -v-\r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO = -v\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__wxrc___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe\r
-       -if exist $(OBJS)\wxrc.tds del $(OBJS)\wxrc.tds\r
-       -if exist $(OBJS)\wxrc.ilc del $(OBJS)\wxrc.ilc\r
-       -if exist $(OBJS)\wxrc.ild del $(OBJS)\wxrc.ild\r
-       -if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf\r
-       -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)\r
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
-|\r
-!endif\r
-\r
-$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp\r
-       $(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) .\wxrc.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+WXRC_OBJECTS =  \
+       $(OBJS)\wxrc_wxrc.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+       -if exist $(OBJS)\wxrc.tds del $(OBJS)\wxrc.tds
+       -if exist $(OBJS)\wxrc.ilc del $(OBJS)\wxrc.ilc
+       -if exist $(OBJS)\wxrc.ild del $(OBJS)\wxrc.ild
+       -if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf
+       -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|
+       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+!endif
+
+$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
+       $(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
+

diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc
index b96836c616cc734378e65487dfef7532527dd192..600d41d2c1f37a2f5999451ea2c121c245082ab0 100644 (file)
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -1,188 +1,188 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-include ../../build/msw/config.gcc\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = gcc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \\r
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
-       $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-WXRC_OBJECTS =  \\r
-       $(OBJS)\wxrc_wxrc.o\r
-\r
-### Conditionally set variables: ###\r
-\r
-ifeq ($(GCC_VERSION),2.95)\r
-GCCFLAGS = -fvtable-thunks\r
-endif\r
-ifeq ($(USE_GUI),0)\r
-PORTNAME = base\r
-endif\r
-ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
-endif\r
-ifeq ($(BUILD),debug)\r
-WXDEBUGFLAG = d\r
-endif\r
-ifeq ($(UNICODE),1)\r
-WXUNICODEFLAG = u\r
-endif\r
-ifeq ($(WXUNIV),1)\r
-WXUNIVNAME = univ\r
-endif\r
-ifeq ($(SHARED),1)\r
-WXDLLFLAG = dll\r
-endif\r
-ifeq ($(SHARED),0)\r
-LIBTYPE_SUFFIX = lib\r
-endif\r
-ifeq ($(SHARED),1)\r
-LIBTYPE_SUFFIX = dll\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-EXTRALIBS_FOR_BASE = \r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
-endif\r
-ifeq ($(USE_XRC),1)\r
-__wxrc___depname = $(OBJS)\wxrc.exe\r
-endif\r
-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
-endif\r
-ifeq ($(WXUNIV),1)\r
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
-endif\r
-ifeq ($(DEBUG_FLAG),0)\r
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTI_DEFINE_p = -DwxNO_RTTI\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREAD_DEFINE_p = -DwxNO_THREADS\r
-endif\r
-ifeq ($(UNICODE),0)\r
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0\r
-endif\r
-ifeq ($(UNICODE),1)\r
-__UNICODE_DEFINE_p = -D_UNICODE\r
-endif\r
-ifeq ($(MSLU),1)\r
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
-ifeq ($(SHARED),1)\r
-__DLLFLAG_p = -DWXUSINGDLL\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_XML_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
-__WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MONOLITHIC),1)\r
-__WXLIB_MONO_p = \\r
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
-endif\r
-ifeq ($(MSLU),1)\r
-__UNICOWS_LIB_p = -lunicows\r
-endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
-ifeq ($(BUILD),debug)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = -g\r
-endif\r
-endif\r
-ifeq ($(BUILD),release)\r
-ifeq ($(DEBUG_INFO),default)\r
-__DEBUGINFO = \r
-endif\r
-endif\r
-ifeq ($(DEBUG_INFO),0)\r
-__DEBUGINFO = \r
-endif\r
-ifeq ($(DEBUG_INFO),1)\r
-__DEBUGINFO = -g\r
-endif\r
-ifeq ($(USE_THREADS),0)\r
-__THREADSFLAG = \r
-endif\r
-ifeq ($(USE_THREADS),1)\r
-__THREADSFLAG = -mthreads\r
-endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__wxrc___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe\r
-\r
-ifeq ($(USE_XRC),1)\r
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)\r
-       $(CXX) -o $@ $(WXRC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
-endif\r
-\r
-$(OBJS)\wxrc_wxrc.o: ./wxrc.cpp\r
-       $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-.PHONY: all clean\r
-\r
-\r
-SHELL := $(COMSPEC)\r
-\r
-# Dependencies tracking:\r
--include $(OBJS)/*.d\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+       $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+WXRC_OBJECTS =  \
+       $(OBJS)\wxrc_wxrc.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
+ifeq ($(USE_XRC),1)
+__wxrc___depname = $(OBJS)\wxrc.exe
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_GDIPLUS),1)
+__GDIPLUS_LIB_p = -lgdiplus
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean: 
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+
+ifeq ($(USE_XRC),1)
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+       $(CXX) -o $@ $(WXRC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+endif
+
+$(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
+       $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d

diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 1af063d2bd5f58411a572a64eb6800cdcb78e44a..027e69a16c35ab4407592fe2cff1b74ec8ed0577 100644 (file)
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -1,255 +1,279 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include <../../build/msw/config.vc>\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = vc\r
-OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
-LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = \\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \\r
-       $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \\r
-       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \\r
-       /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
-WXRC_OBJECTS =  \\r
-       $(OBJS)\wxrc_wxrc.obj\r
-\r
-### Conditionally set variables: ###\r
-\r
-!if "$(USE_GUI)" == "0"\r
-PORTNAME = base\r
-!endif\r
-!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-WXDEBUGFLAG = d\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-WXUNICODEFLAG = u\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-WXUNIVNAME = univ\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-WXDLLFLAG = dll\r
-!endif\r
-!if "$(SHARED)" == "0"\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-LINK_TARGET_CPU = /MACHINE:AMD64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-LINK_TARGET_CPU = /MACHINE:IA64\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-!if "$(USE_XRC)" == "1"\r
-__wxrc___depname = $(OBJS)\wxrc.exe\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_0 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_0 = /Zi\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "0"\r
-__DEBUGINFO_1 = \r
-!endif\r
-!if "$(DEBUG_INFO)" == "1"\r
-__DEBUGINFO_1 = /DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-____DEBUGRUNTIME_2_p = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-____DEBUGRUNTIME_2_p = /D_DEBUG\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__DEBUGRUNTIME_3 = \r
-!endif\r
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
-__DEBUGRUNTIME_3 = d\r
-!endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_4 = /Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_4 = /O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_7 = L\r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_7 = T\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = D\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTIFLAG_9 = \r
-!endif\r
-!if "$(USE_RTTI)" == "1"\r
-__RTTIFLAG_9 = /GR\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONSFLAG_10 = \r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "1"\r
-__EXCEPTIONSFLAG_10 = /EHsc\r
-!endif\r
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
-!endif\r
-!if "$(WXUNIV)" == "1"\r
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
-!endif\r
-!if "$(DEBUG_FLAG)" == "0"\r
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
-!endif\r
-!if "$(USE_EXCEPTIONS)" == "0"\r
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
-!endif\r
-!if "$(USE_RTTI)" == "0"\r
-__RTTI_DEFINE_p = /DwxNO_RTTI\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREAD_DEFINE_p = /DwxNO_THREADS\r
-!endif\r
-!if "$(UNICODE)" == "0"\r
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
-!endif\r
-!if "$(UNICODE)" == "1"\r
-__UNICODE_DEFINE_p = /D_UNICODE\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(SHARED)" == "1"\r
-__DLLFLAG_p = /DWXUSINGDLL\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_XML_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_BASE_p = \\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__WXLIB_MONO_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-!if "$(MSLU)" == "1"\r
-__UNICOWS_LIB_p = unicows.lib\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-\r
-all: $(OBJS)\r
-$(OBJS):\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all: $(__wxrc___depname)\r
-\r
-clean: \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe\r
-       -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk\r
-       -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb\r
-\r
-!if "$(USE_XRC)" == "1"\r
-$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)\r
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<\r
-       $(WXRC_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
-<<\r
-!endif\r
-\r
-$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(__DEBUGINFO_2) \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \
+       /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)
+WXRC_OBJECTS =  \
+       $(OBJS)\wxrc_wxrc.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = 
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+       -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk
+       -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb
+
+!if "$(USE_XRC)" == "1"
+$(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+       $(WXRC_OBJECTS)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+!endif
+
+$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp
+

diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat
index 9ec78250ee9e9abea13dd89a6ba71f40fccba69a..a0c88f68dc51cf941cfd0de14ca3895bf91ca687 100644 (file)
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/makefile.wat
@@ -1,250 +1,250 @@
-# =========================================================================\r
-#     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
-#     Do not modify, all changes will be overwritten!\r
-# =========================================================================\r
-\r
-!include ../../build/msw/config.wat\r
-\r
-# -------------------------------------------------------------------------\r
-# Do not modify the rest of this file!\r
-# -------------------------------------------------------------------------\r
-\r
-# Speed up compilation a bit:\r
-!ifdef __LOADDLL__\r
-!  loaddll wcc      wccd\r
-!  loaddll wccaxp   wccdaxp\r
-!  loaddll wcc386   wccd386\r
-!  loaddll wpp      wppdi86\r
-!  loaddll wppaxp   wppdaxp\r
-!  loaddll wpp386   wppd386\r
-! if $(__VERSION__) >= 1280\r
-!  loaddll wlink    wlinkd\r
-! else\r
-!  loaddll wlink    wlink\r
-! endif\r
-!  loaddll wlib     wlibd\r
-!endif\r
-\r
-# We need these variables in some bakefile-made rules:\r
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-\r
-\r
-### Conditionally set variables: ###\r
-\r
-PORTNAME =\r
-!ifeq USE_GUI 0\r
-PORTNAME = base\r
-!endif\r
-!ifeq USE_GUI 1\r
-PORTNAME = msw\r
-!endif\r
-WXDEBUGFLAG =\r
-!ifeq BUILD debug\r
-WXDEBUGFLAG = d\r
-!endif\r
-WXUNICODEFLAG =\r
-!ifeq UNICODE 1\r
-WXUNICODEFLAG = u\r
-!endif\r
-WXUNIVNAME =\r
-!ifeq WXUNIV 1\r
-WXUNIVNAME = univ\r
-!endif\r
-WXDLLFLAG =\r
-!ifeq SHARED 1\r
-WXDLLFLAG = dll\r
-!endif\r
-LIBTYPE_SUFFIX =\r
-!ifeq SHARED 0\r
-LIBTYPE_SUFFIX = lib\r
-!endif\r
-!ifeq SHARED 1\r
-LIBTYPE_SUFFIX = dll\r
-!endif\r
-EXTRALIBS_FOR_BASE =\r
-!ifeq MONOLITHIC 0\r
-EXTRALIBS_FOR_BASE = \r
-!endif\r
-!ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
-!endif\r
-__wxrc___depname =\r
-!ifeq USE_XRC 1\r
-__wxrc___depname = $(OBJS)\wxrc.exe\r
-!endif\r
-__DEBUGINFO_0 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_0 = -d0\r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_0 = -d2\r
-!endif\r
-__DEBUGINFO_1 =\r
-!ifeq BUILD debug\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-!endif\r
-!ifeq BUILD release\r
-!ifeq DEBUG_INFO default\r
-__DEBUGINFO_1 = \r
-!endif\r
-!endif\r
-!ifeq DEBUG_INFO 0\r
-__DEBUGINFO_1 = \r
-!endif\r
-!ifeq DEBUG_INFO 1\r
-__DEBUGINFO_1 = debug all\r
-!endif\r
-__OPTIMIZEFLAG_2 =\r
-!ifeq BUILD debug\r
-__OPTIMIZEFLAG_2 = -od\r
-!endif\r
-!ifeq BUILD release\r
-__OPTIMIZEFLAG_2 = -ot -ox\r
-!endif\r
-__THREADSFLAG_5 =\r
-!ifeq USE_THREADS 0\r
-__THREADSFLAG_5 = \r
-!endif\r
-!ifeq USE_THREADS 1\r
-__THREADSFLAG_5 = -bm\r
-!endif\r
-__RUNTIME_LIBS_6 =\r
-!ifeq RUNTIME_LIBS dynamic\r
-__RUNTIME_LIBS_6 = -br\r
-!endif\r
-!ifeq RUNTIME_LIBS static\r
-__RUNTIME_LIBS_6 = \r
-!endif\r
-__RTTIFLAG_7 =\r
-!ifeq USE_RTTI 0\r
-__RTTIFLAG_7 = \r
-!endif\r
-!ifeq USE_RTTI 1\r
-__RTTIFLAG_7 = -xr\r
-!endif\r
-__EXCEPTIONSFLAG_8 =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONSFLAG_8 = \r
-!endif\r
-!ifeq USE_EXCEPTIONS 1\r
-__EXCEPTIONSFLAG_8 = -xs\r
-!endif\r
-__WXUNIV_DEFINE_p =\r
-!ifeq WXUNIV 1\r
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
-!endif\r
-__DEBUG_DEFINE_p =\r
-!ifeq DEBUG_FLAG 0\r
-__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
-!endif\r
-__EXCEPTIONS_DEFINE_p =\r
-!ifeq USE_EXCEPTIONS 0\r
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
-!endif\r
-__RTTI_DEFINE_p =\r
-!ifeq USE_RTTI 0\r
-__RTTI_DEFINE_p = -dwxNO_RTTI\r
-!endif\r
-__THREAD_DEFINE_p =\r
-!ifeq USE_THREADS 0\r
-__THREAD_DEFINE_p = -dwxNO_THREADS\r
-!endif\r
-__UNICODE_DEFINE_p =\r
-!ifeq UNICODE 0\r
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0\r
-!endif\r
-!ifeq UNICODE 1\r
-__UNICODE_DEFINE_p = -d_UNICODE\r
-!endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-__DLLFLAG_p =\r
-!ifeq SHARED 1\r
-__DLLFLAG_p = -dWXUSINGDLL\r
-!endif\r
-__WXLIB_XML_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_XML_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
-\r
-### Variables: ###\r
-\r
-WX_RELEASE_NODOT = 29\r
-COMPILER_PREFIX = wat\r
-OBJS = &\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
-SETUPHDIR = &\r
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-WXRC_OBJECTS =  &\r
-       $(OBJS)\wxrc_wxrc.obj\r
-\r
-\r
-all : $(OBJS)\r
-$(OBJS) :\r
-       -if not exist $(OBJS) mkdir $(OBJS)\r
-\r
-### Targets: ###\r
-\r
-all : .SYMBOLIC $(__wxrc___depname)\r
-\r
-clean : .SYMBOLIC \r
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
-       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
-       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
-       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe\r
-\r
-!ifeq USE_XRC 1\r
-$(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)\r
-       @%create $(OBJS)\wxrc.lbc\r
-       @%append $(OBJS)\wxrc.lbc option quiet\r
-       @%append $(OBJS)\wxrc.lbc name $^@\r
-       @%append $(OBJS)\wxrc.lbc option caseexact\r
-       @%append $(OBJS)\wxrc.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
-       @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i\r
-       @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxrc.lbc library %i\r
-       @%append $(OBJS)\wxrc.lbc\r
-       @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i\r
-       wlink @$(OBJS)\wxrc.lbc\r
-!endif\r
-\r
-$(OBJS)\wxrc_wxrc.obj :  .AUTODEPEND .\wxrc.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WXRC_CXXFLAGS) $<\r
-\r
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.7 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+!  loaddll wcc      wccd
+!  loaddll wccaxp   wccdaxp
+!  loaddll wcc386   wccd386
+!  loaddll wpp      wppdi86
+!  loaddll wppaxp   wppdaxp
+!  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
+!  loaddll wlink    wlink
+! endif
+!  loaddll wlib     wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__wxrc___depname =
+!ifeq USE_XRC 1
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+WXRC_OBJECTS =  &
+       $(OBJS)\wxrc_wxrc.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(__wxrc___depname)
+
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+       -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
+
+!ifeq USE_XRC 1
+$(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
+       @%create $(OBJS)\wxrc.lbc
+       @%append $(OBJS)\wxrc.lbc option quiet
+       @%append $(OBJS)\wxrc.lbc name $^@
+       @%append $(OBJS)\wxrc.lbc option caseexact
+       @%append $(OBJS)\wxrc.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
+       @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
+       @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxrc.lbc library %i
+       @%append $(OBJS)\wxrc.lbc
+       @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i
+       wlink @$(OBJS)\wxrc.lbc
+!endif
+
+$(OBJS)\wxrc_wxrc.obj :  .AUTODEPEND .\wxrc.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WXRC_CXXFLAGS) $<
+

diff --git a/utils/wxrc/wxrc.dsp b/utils/wxrc/wxrc.dsp
index 7245f3feb8329347fc47ed3811423d7c18b17599..2a17f4ca7e0e9e46ecbb44cc857255ea33900a74 100644 (file)
--- a/utils/wxrc/wxrc.dsp
+++ b/utils/wxrc/wxrc.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxrc"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxrc"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxrc"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"\r
 # PROP Intermediate_Dir "vc_mswu\wxrc"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0\r
 BSC32=bscmake.exe\r

diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj
index 747c031ad20ac29e59f576576f208daadedc3f20..719519dc93d781d152da69961c319dcb24900efb 100644 (file)
--- a/utils/wxrc/wxrc_vc7.vcproj
+++ b/utils/wxrc/wxrc_vc7.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -110,13 +110,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -237,13 +239,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
@@ -364,13 +368,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
@@ -491,13 +497,15 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj
index 6381c973c0c1b598f62705f09106e0a3bf50bb7c..f216ff4562744d2083336c6121c1086ed8409195 100644 (file)
--- a/utils/wxrc/wxrc_vc8.vcproj
+++ b/utils/wxrc/wxrc_vc8.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -176,7 +176,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -184,6 +184,8 @@
                                ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -367,7 +369,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -375,6 +377,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -558,7 +562,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -749,7 +755,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -757,6 +763,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/utils/wxrc/wxrc_vc9.vcproj b/utils/wxrc/wxrc_vc9.vcproj
index 4db1d26597f856616339432e24e9e385eb1a9a2c..f651dee5f5aa0eb0db82f82419e5e1c84b10541a 100644 (file)
--- a/utils/wxrc/wxrc_vc9.vcproj
+++ b/utils/wxrc/wxrc_vc9.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.7 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,7 +43,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                        />\r
@@ -136,7 +136,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                        />\r
@@ -172,7 +172,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -180,6 +180,8 @@
                                ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -227,7 +229,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                        />\r
@@ -320,7 +322,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                        />\r
@@ -356,7 +358,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -364,6 +366,8 @@
                                ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,7 +415,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                        />\r
@@ -504,7 +508,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                        />\r
@@ -540,7 +544,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -548,6 +552,8 @@
                                ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -595,7 +601,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                        />\r
@@ -688,7 +694,7 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                                PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                        />\r
@@ -724,7 +730,7 @@
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\wxrc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -732,6 +738,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/wxGTK.spec b/wxGTK.spec
index cd3509939acc686240b5131c7f9caa4c63ac942a..ac46a9b9b0b9505fe3bf35f357da8da3a3a2d925 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -355,6 +355,7 @@ wx/unix/apptbase.h
 wx/unix/apptrait.h
 wx/unix/chkconf.h
 wx/unix/evtloop.h
+wx/unix/evtloopsrc.h
 wx/unix/pipe.h
 wx/unix/stdpaths.h
 wx/unix/stackwalk.h

diff --git a/wxMotif.spec b/wxMotif.spec
index f7ac11d72983d5e7e81d8423041f91449371c3f2..17f5818d77c706ed08f1a011247d424d05eeecd1 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -260,6 +260,7 @@ wx/unix/apptbase.h
 wx/unix/apptrait.h
 wx/unix/chkconf.h
 wx/unix/evtloop.h
+wx/unix/evtloopsrc.h
 wx/unix/pipe.h
 wx/unix/stdpaths.h
 wx/unix/stackwalk.h

diff --git a/wxX11.spec b/wxX11.spec
index a49b01bb762356f3a0a2c8c4dd6e459dd825d8f8..9ee4ad19a94785aeffd2baaff7fd843acec04a21 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -284,6 +284,7 @@ wx/unix/apptbase.h
 wx/unix/apptrait.h
 wx/unix/chkconf.h
 wx/unix/evtloop.h
+wx/unix/evtloopsrc.h
 wx/unix/pipe.h
 wx/unix/stdpaths.h
 wx/unix/stackwalk.h